Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 922f9cfa authored by Denis Cheng's avatar Denis Cheng Committed by Linus Torvalds
Browse files

fs/char_dev.c: chrdev_open marked static and removed from fs.h 



There is an outdated comment in serial_core.c also fixed.

Signed-off-by: default avatarDenis Cheng <crquan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b55ab616

drivers/serial/serial_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1553,8 +1553,8 @@ static struct uart_state *uart_get(struct uart_driver *drv, int line) 
}



/*

 * In 2.4.5, calls to uart_open are serialised by the BKL in

 *   linux/fs/devices.c:chrdev_open()

 * calls to uart_open are serialised by the BKL in

 *   fs/char_dev.c:chrdev_open()

 * Note that if this fails, then uart_close() _will_ be called.

 *

 * In time, we want to scrap the "opening nonpresent ports"

fs/char_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void cdev_put(struct cdev *p) 
/*

 * Called every time a character special file is opened

 */

int chrdev_open(struct inode * inode, struct file * filp)

static int chrdev_open(struct inode *inode, struct file *filp)

{

	struct cdev *p;

	struct cdev *new = NULL;

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -1624,7 +1624,6 @@ extern int register_chrdev(unsigned int, const char *, 
			   const struct file_operations *);

extern void unregister_chrdev(unsigned int, const char *);

extern void unregister_chrdev_region(dev_t, unsigned);

extern int chrdev_open(struct inode *, struct file *);

extern void chrdev_show(struct seq_file *,off_t);



/* fs/block_dev.c */