diff options
-rw-r--r-- | drivers/serial/serial_core.c | 4 | ||||
-rw-r--r-- | fs/char_dev.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index efef494d945a..0f5a17987cca 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) | |||
1553 | } | 1553 | } |
1554 | 1554 | ||
1555 | /* | 1555 | /* |
1556 | * In 2.4.5, calls to uart_open are serialised by the BKL in | 1556 | * calls to uart_open are serialised by the BKL in |
1557 | * linux/fs/devices.c:chrdev_open() | 1557 | * fs/char_dev.c:chrdev_open() |
1558 | * Note that if this fails, then uart_close() _will_ be called. | 1558 | * Note that if this fails, then uart_close() _will_ be called. |
1559 | * | 1559 | * |
1560 | * In time, we want to scrap the "opening nonpresent ports" | 1560 | * In time, we want to scrap the "opening nonpresent ports" |
diff --git a/fs/char_dev.c b/fs/char_dev.c index 2c7a8b5b4598..038674aa88a7 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
@@ -357,7 +357,7 @@ void cdev_put(struct cdev *p) | |||
357 | /* | 357 | /* |
358 | * Called every time a character special file is opened | 358 | * Called every time a character special file is opened |
359 | */ | 359 | */ |
360 | int chrdev_open(struct inode * inode, struct file * filp) | 360 | static int chrdev_open(struct inode *inode, struct file *filp) |
361 | { | 361 | { |
362 | struct cdev *p; | 362 | struct cdev *p; |
363 | struct cdev *new = NULL; | 363 | struct cdev *new = NULL; |
diff --git a/include/linux/fs.h b/include/linux/fs.h index cb3a9001f3b9..18cfbf76ec5b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1624,7 +1624,6 @@ extern int register_chrdev(unsigned int, const char *, | |||
1624 | const struct file_operations *); | 1624 | const struct file_operations *); |
1625 | extern void unregister_chrdev(unsigned int, const char *); | 1625 | extern void unregister_chrdev(unsigned int, const char *); |
1626 | extern void unregister_chrdev_region(dev_t, unsigned); | 1626 | extern void unregister_chrdev_region(dev_t, unsigned); |
1627 | extern int chrdev_open(struct inode *, struct file *); | ||
1628 | extern void chrdev_show(struct seq_file *,off_t); | 1627 | extern void chrdev_show(struct seq_file *,off_t); |
1629 | 1628 | ||
1630 | /* fs/block_dev.c */ | 1629 | /* fs/block_dev.c */ |