Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64ccd715d3cf498318b14b646ce5f97e7ab15bb5

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent bfb07599da
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] Convert users to tty_unregister_ldisc() 

tty_register_ldisc(N_FOO, NULL) => tty_unregister_ldisc(N_FOO)

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

drivers/bluetooth/hci_ldisc.c
Diff comments   View file @ 64ccd71
... ... @@ -576,7 +576,7 @@
576 576 #endif
577 577  
578 578 /* Release tty registration of line discipline */
579   - if ((err = tty_register_ldisc(N_HCI, NULL)))
  579 + if ((err = tty_unregister_ldisc(N_HCI)))
580 580 BT_ERR("Can't unregister HCI line discipline (%d)", err);
581 581 }
582 582  
drivers/char/n_hdlc.c
Diff comments   View file @ 64ccd71
... ... @@ -960,7 +960,7 @@
960 960 static void __exit n_hdlc_exit(void)
961 961 {
962 962 /* Release tty registration of line discipline */
963   - int status = tty_register_ldisc(N_HDLC, NULL);
  963 + int status = tty_unregister_ldisc(N_HDLC);
964 964  
965 965 if (status)
966 966 printk(hdlc_unregister_fail, status);
drivers/char/n_r3964.c
Diff comments   View file @ 64ccd71
... ... @@ -200,7 +200,7 @@
200 200  
201 201 TRACE_M ("cleanup_module()");
202 202  
203   - status=tty_register_ldisc(N_R3964, NULL);
  203 + status=tty_unregister_ldisc(N_R3964);
204 204  
205 205 if(status!=0)
206 206 {
drivers/input/serio/serport.c
Diff comments   View file @ 64ccd71
... ... @@ -257,7 +257,7 @@
257 257  
258 258 static void __exit serport_exit(void)
259 259 {
260   - tty_register_ldisc(N_MOUSE, NULL);
  260 + tty_unregister_ldisc(N_MOUSE);
261 261 }
262 262  
263 263 module_init(serport_init);
drivers/net/hamradio/6pack.c
Diff comments   View file @ 64ccd71
... ... @@ -848,7 +848,7 @@
848 848 {
849 849 int ret;
850 850  
851   - if ((ret = tty_register_ldisc(N_6PACK, NULL)))
  851 + if ((ret = tty_unregister_ldisc(N_6PACK)))
852 852 printk(msg_unregfail, ret);
853 853 }
854 854  
drivers/net/hamradio/mkiss.c
Diff comments   View file @ 64ccd71
... ... @@ -934,7 +934,7 @@
934 934 kfree(ax25_ctrls);
935 935 ax25_ctrls = NULL;
936 936  
937   - if ((i = tty_register_ldisc(N_AX25, NULL)))
  937 + if ((i = tty_unregister_ldisc(N_AX25)))
938 938 printk(KERN_ERR "mkiss: can't unregister line discipline (err = %d)\n", i);
939 939 }
940 940  
drivers/net/irda/irtty-sir.c
Diff comments   View file @ 64ccd71
... ... @@ -626,7 +626,7 @@
626 626 {
627 627 int err;
628 628  
629   - if ((err = tty_register_ldisc(N_IRDA, NULL))) {
  629 + if ((err = tty_unregister_ldisc(N_IRDA))) {
630 630 IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n",
631 631 __FUNCTION__, err);
632 632 }
drivers/net/ppp_async.c
Diff comments   View file @ 64ccd71
... ... @@ -1025,7 +1025,7 @@
1025 1025  
1026 1026 static void __exit ppp_async_cleanup(void)
1027 1027 {
1028   - if (tty_register_ldisc(N_PPP, NULL) != 0)
  1028 + if (tty_unregister_ldisc(N_PPP) != 0)
1029 1029 printk(KERN_ERR "failed to unregister PPP line discipline\n");
1030 1030 }
1031 1031  
drivers/net/ppp_synctty.c
Diff comments   View file @ 64ccd71
... ... @@ -793,7 +793,7 @@
793 793 static void __exit
794 794 ppp_sync_cleanup(void)
795 795 {
796   - if (tty_register_ldisc(N_SYNC_PPP, NULL) != 0)
  796 + if (tty_unregister_ldisc(N_SYNC_PPP) != 0)
797 797 printk(KERN_ERR "failed to unregister Sync PPP line discipline\n");
798 798 }
799 799  
... ... @@ -1430,7 +1430,7 @@
1430 1430 kfree(slip_devs);
1431 1431 slip_devs = NULL;
1432 1432  
1433   - if ((i = tty_register_ldisc(N_SLIP, NULL)))
  1433 + if ((i = tty_unregister_ldisc(N_SLIP)))
1434 1434 {
1435 1435 printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
1436 1436 }
drivers/net/wan/x25_asy.c
Diff comments   View file @ 64ccd71
... ... @@ -829,7 +829,7 @@
829 829 }
830 830  
831 831 kfree(x25_asy_devs);
832   - tty_register_ldisc(N_X25, NULL);
  832 + tty_unregister_ldisc(N_X25);
833 833 }
834 834  
835 835 module_init(init_x25_asy);
drivers/net/wireless/strip.c
Diff comments   View file @ 64ccd71
... ... @@ -2828,7 +2828,7 @@
2828 2828 /* Unregister with the /proc/net file here. */
2829 2829 proc_net_remove("strip");
2830 2830  
2831   - if ((i = tty_register_ldisc(N_STRIP, NULL)))
  2831 + if ((i = tty_unregister_ldisc(N_STRIP)))
2832 2832 printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);
2833 2833  
2834 2834 printk(signoff);