fs/char_dev.c: chrdev_open marked static and removed from fs.h
authorDenis Cheng <crquan@gmail.com>
Fri, 8 Feb 2008 12:22:00 +0000 (04:22 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 17:22:42 +0000 (09:22 -0800)
There is an outdated comment in serial_core.c also fixed.

Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/serial_core.c
fs/char_dev.c
include/linux/fs.h

index efef494d945a9a3aec64447cef9a55b8eaa42b3e..0f5a17987ccacaf84283a1754134adfd7f3c2f7a 100644 (file)
@@ -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"
index 2c7a8b5b45989b25d40f8cb6a283d7ffb8940c5a..038674aa88a72c09a88388ee7cf1b54839675052 100644 (file)
@@ -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;
index cb3a9001f3b9c169c099f5ab37b82b9086427b1a..18cfbf76ec5be8f1f20ddb2fad22f7cd6101596c 100644 (file)
@@ -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 */