From: Denis Cheng Date: Fri, 8 Feb 2008 12:22:00 +0000 (-0800) Subject: fs/char_dev.c: chrdev_open marked static and removed from fs.h X-Git-Tag: v2.6.25-rc1~60 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=922f9cfa79b52c85b6002d96cb0eefd13437c58c;p=linux-2.6-omap-h63xx.git 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: Denis Cheng Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index efef494d945..0f5a17987cc 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -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" diff --git a/fs/char_dev.c b/fs/char_dev.c index 2c7a8b5b459..038674aa88a 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -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; diff --git a/include/linux/fs.h b/include/linux/fs.h index cb3a9001f3b..18cfbf76ec5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -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 */