Convert users to tty_unregister_ldisc()
Subsystems (5)
PATCH 2/2 Convert users to tty_unregister_ldisc()
tty_register_ldisc(N_FOO, NULL) => tty_unregister_ldisc(N_FOO)
Signed-off-by Alexey Dobriyan <[email protected]>
---
drivers/bluetooth/hci_ldisc.c | 2 +- drivers/char/n_hdlc.c | 2 +- drivers/char/n_r3964.c | 2 +- drivers/input/serio/serport.c | 2 +- drivers/net/hamradio/6pack.c | 2 +- drivers/net/hamradio/mkiss.c | 2 +- drivers/net/irda/irtty-sir.c | 2 +- drivers/net/ppp_async.c | 2 +- drivers/net/ppp_synctty.c | 2 +- drivers/net/slip.c | 2 +- drivers/net/wan/x25_asy.c | 2 +- drivers/net/wireless/strip.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
drivers/bluetooth/hci_ldisc.c +1 -1
@@ -576,7 +576,7 @@ static void __exit hci_uart_exit(void)#endif /* Release tty registration of line discipline */ -if ((err =tty_register_ldisc (N_HCI ,NULL ))) +if ((err =tty_unregister_ldisc (N_HCI )))BT_ERR ("Can't unregister HCI line discipline (%d)" , err); }
drivers/char/n_hdlc.c +1 -1
@@ -960,7 +960,7 @@ static char hdlc_unregister_fail[] __exi static void __exit n_hdlc_exit(void) {/* Release tty registration of line discipline */ -int status =tty_register_ldisc (N_HDLC ,NULL ); +int status =tty_unregister_ldisc (N_HDLC );if (status)printk (hdlc_unregister_fail, status);
drivers/char/n_r3964.c +1 -1
@@ -200,7 +200,7 @@ static void __exit r3964_exit(void)TRACE_M ("cleanup_module()" ); - status=tty_register_ldisc (N_R3964 ,NULL ); + status=tty_unregister_ldisc (N_R3964 );if (status!=0 ) {
drivers/input/serio/serport.c +1 -1
@@ -257,7 +257,7 @@ static int __init serport_init(void) static void __exit serport_exit(void) { -tty_register_ldisc (N_MOUSE ,NULL ); +tty_unregister_ldisc (N_MOUSE ); }module_init (serport_init);
drivers/net/hamradio/6pack.c +1 -1
@@ -848,7 +848,7 @@ static void __exit sixpack_exit_driver(v {int ret; -if ((ret =tty_register_ldisc (N_6PACK ,NULL ))) +if ((ret =tty_unregister_ldisc (N_6PACK )))printk (msg_unregfail, ret); }
drivers/net/hamradio/mkiss.c +1 -1
@@ -934,7 +934,7 @@ static void __exit mkiss_exit_driver(voikfree (ax25_ctrls); ax25_ctrls =NULL ; -if ((i =tty_register_ldisc (N_AX25 ,NULL ))) +if ((i =tty_unregister_ldisc (N_AX25 )))printk (KERN_ERR "mkiss: can't unregister line discipline (err = %d)\n" , i); }
drivers/net/irda/irtty-sir.c +1 -1
@@ -626,7 +626,7 @@ static void __exit irtty_sir_cleanup(voi {int err; -if ((err =tty_register_ldisc (N_IRDA ,NULL ))) { +if ((err =tty_unregister_ldisc (N_IRDA ))) {IRDA_ERROR ("%s(), can't unregister line discipline (err = %d)\n" , __FUNCTION__, err); }
drivers/net/ppp_async.c +1 -1
@@ -1025,7 +1025,7 @@ static void async_lcp_peek(struct asyncp static void __exit ppp_async_cleanup(void) { -if (tty_register_ldisc (N_PPP ,NULL ) !=0 ) +if (tty_unregister_ldisc (N_PPP ) !=0 )printk (KERN_ERR "failed to unregister PPP line discipline\n" ); }
drivers/net/ppp_synctty.c +1 -1
@@ -793,7 +793,7 @@ err: static void __exitppp_sync_cleanup (void ) { -if (tty_register_ldisc (N_SYNC_PPP ,NULL ) !=0 ) +if (tty_unregister_ldisc (N_SYNC_PPP ) !=0 )printk (KERN_ERR "failed to unregister Sync PPP line discipline\n" ); }
drivers/net/slip.c +1 -1
@@ -1430,7 +1430,7 @@ static void __exit slip_exit(void)kfree (slip_devs); slip_devs =NULL ; -if ((i =tty_register_ldisc (N_SLIP ,NULL ))) +if ((i =tty_unregister_ldisc (N_SLIP ))) {printk (KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n" , i); }
drivers/net/wan/x25_asy.c +1 -1
@@ -829,7 +829,7 @@ static void __exit exit_x25_asy(void) }kfree (x25_asy_devs); -tty_register_ldisc (N_X25 ,NULL ); +tty_unregister_ldisc (N_X25 ); }module_init (init_x25_asy);
drivers/net/wireless/strip.c +1 -1
@@ -2828,7 +2828,7 @@ static void __exit strip_exit_driver(voi/* Unregister with the /proc/net file here. */ proc_net_remove ("strip" ); -if ((i =tty_register_ldisc (N_STRIP ,NULL ))) +if ((i =tty_unregister_ldisc (N_STRIP )))printk (KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n" , i);printk (signoff);