Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d09d7ddf3018b4c6efa76dce72f6dec6054fa22b

Authored by Alan Cox
Committed by Linus Torvalds
1 parent 2aae4a108d
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

[PATCH] There is no devfs, there has never been a devfs, we have always been at war with... 

Jon Smirl noted a couple of tty driver functions now are quite misleadingly
named with the death of devfs.  A quick grep found another case in the lp
driver.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

... ... @@ -906,7 +906,7 @@
906 906 lp_class = class_create(THIS_MODULE, "printer");
907 907 if (IS_ERR(lp_class)) {
908 908 err = PTR_ERR(lp_class);
909   - goto out_devfs;
  909 + goto out_reg;
910 910 }
911 911  
912 912 if (parport_register_driver (&lp_driver)) {
... ... @@ -927,7 +927,7 @@
927 927  
928 928 out_class:
929 929 class_destroy(lp_class);
930   -out_devfs:
  930 +out_reg:
931 931 unregister_chrdev(LP_MAJOR, "lp");
932 932 return err;
933 933 }
drivers/char/vc_screen.c
Diff comments   View file @ d09d7dd
... ... @@ -474,14 +474,15 @@
474 474  
475 475 static struct class *vc_class;
476 476  
477   -void vcs_make_devfs(struct tty_struct *tty)
  477 +void vcs_make_sysfs(struct tty_struct *tty)
478 478 {
479 479 class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
480 480 NULL, "vcs%u", tty->index + 1);
481 481 class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
482 482 NULL, "vcsa%u", tty->index + 1);
483 483 }
484   -void vcs_remove_devfs(struct tty_struct *tty)
  484 +
  485 +void vcs_remove_sysfs(struct tty_struct *tty)
485 486 {
486 487 class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1));
487 488 class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129));
... ... @@ -128,8 +128,8 @@
128 128 #define DEFAULT_BELL_PITCH 750
129 129 #define DEFAULT_BELL_DURATION (HZ/8)
130 130  
131   -extern void vcs_make_devfs(struct tty_struct *tty);
132   -extern void vcs_remove_devfs(struct tty_struct *tty);
  131 +extern void vcs_make_sysfs(struct tty_struct *tty);
  132 +extern void vcs_remove_sysfs(struct tty_struct *tty);
133 133  
134 134 extern void console_map_init(void);
135 135 #ifdef CONFIG_PROM_CONSOLE
... ... @@ -2498,7 +2498,7 @@
2498 2498 tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
2499 2499 }
2500 2500 release_console_sem();
2501   - vcs_make_devfs(tty);
  2501 + vcs_make_sysfs(tty);
2502 2502 return ret;
2503 2503 }
2504 2504 }
... ... @@ -2511,7 +2511,7 @@
2511 2511 * and taking a ref against the tty while we're in the process of forgetting
2512 2512 * about it and cleaning things up.
2513 2513 *
2514   - * This is because vcs_remove_devfs() can sleep and will drop the BKL.
  2514 + * This is because vcs_remove_sysfs() can sleep and will drop the BKL.
2515 2515 */
2516 2516 static void con_close(struct tty_struct *tty, struct file *filp)
2517 2517 {
... ... @@ -2524,7 +2524,7 @@
2524 2524 vc->vc_tty = NULL;
2525 2525 tty->driver_data = NULL;
2526 2526 release_console_sem();
2527   - vcs_remove_devfs(tty);
  2527 + vcs_remove_sysfs(tty);
2528 2528 mutex_unlock(&tty_mutex);
2529 2529 /*
2530 2530 * tty_mutex is released, but we still hold BKL, so there is