Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=922f9cfa79b52c85b6002d96cb0eefd13437c58c
Commit: 922f9cfa79b52c85b6002d96cb0eefd13437c58c
Parent: b55ab616fa4b00bdd5c470c70fdf87bab85eec68
Author: Denis Cheng <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:22:00 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:42 2008 -0800
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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
drivers/serial/serial_core.c | 4 ++--
fs/char_dev.c | 2 +-
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 efef494..0f5a179 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 2c7a8b5..038674a 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 cb3a900..18cfbf7 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
