Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 922f9cfa79b52c85b6002d96cb0eefd13437c58c

Authored by Denis Cheng
Committed by Linus Torvalds
1 parent b55ab616fa
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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 <crquan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 3 additions and 4 deletions Side-by-side Diff

drivers/serial/serial_core.c
Diff comments   View file @ 922f9cf
... ... @@ -1553,8 +1553,8 @@
1553 1553 }
1554 1554  
1555 1555 /*
1556   - * In 2.4.5, calls to uart_open are serialised by the BKL in
1557   - * linux/fs/devices.c:chrdev_open()
  1556 + * calls to uart_open are serialised by the BKL in
  1557 + * fs/char_dev.c:chrdev_open()
1558 1558 * Note that if this fails, then uart_close() _will_ be called.
1559 1559 *
1560 1560 * In time, we want to scrap the "opening nonpresent ports"
... ... @@ -357,7 +357,7 @@
357 357 /*
358 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 362 struct cdev *p;
363 363 struct cdev *new = NULL;
... ... @@ -1624,7 +1624,6 @@
1624 1624 const struct file_operations *);
1625 1625 extern void unregister_chrdev(unsigned int, const char *);
1626 1626 extern void unregister_chrdev_region(dev_t, unsigned);
1627   -extern int chrdev_open(struct inode *, struct file *);
1628 1627 extern void chrdev_show(struct seq_file *,off_t);
1629 1628  
1630 1629 /* fs/block_dev.c */