mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-20 08:38:24 +08:00
[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>
This commit is contained in:
parent
bfb07599da
commit
64ccd715d3
@ -576,7 +576,7 @@ static void __exit hci_uart_exit(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Release tty registration of line discipline */
|
/* 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);
|
BT_ERR("Can't unregister HCI line discipline (%d)", err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -960,7 +960,7 @@ static char hdlc_unregister_fail[] __exitdata =
|
|||||||
static void __exit n_hdlc_exit(void)
|
static void __exit n_hdlc_exit(void)
|
||||||
{
|
{
|
||||||
/* Release tty registration of line discipline */
|
/* Release tty registration of line discipline */
|
||||||
int status = tty_register_ldisc(N_HDLC, NULL);
|
int status = tty_unregister_ldisc(N_HDLC);
|
||||||
|
|
||||||
if (status)
|
if (status)
|
||||||
printk(hdlc_unregister_fail, status);
|
printk(hdlc_unregister_fail, status);
|
||||||
|
@ -200,7 +200,7 @@ static void __exit r3964_exit(void)
|
|||||||
|
|
||||||
TRACE_M ("cleanup_module()");
|
TRACE_M ("cleanup_module()");
|
||||||
|
|
||||||
status=tty_register_ldisc(N_R3964, NULL);
|
status=tty_unregister_ldisc(N_R3964);
|
||||||
|
|
||||||
if(status!=0)
|
if(status!=0)
|
||||||
{
|
{
|
||||||
|
@ -257,7 +257,7 @@ static int __init serport_init(void)
|
|||||||
|
|
||||||
static void __exit serport_exit(void)
|
static void __exit serport_exit(void)
|
||||||
{
|
{
|
||||||
tty_register_ldisc(N_MOUSE, NULL);
|
tty_unregister_ldisc(N_MOUSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(serport_init);
|
module_init(serport_init);
|
||||||
|
@ -848,7 +848,7 @@ static void __exit sixpack_exit_driver(void)
|
|||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if ((ret = tty_register_ldisc(N_6PACK, NULL)))
|
if ((ret = tty_unregister_ldisc(N_6PACK)))
|
||||||
printk(msg_unregfail, ret);
|
printk(msg_unregfail, ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -934,7 +934,7 @@ static void __exit mkiss_exit_driver(void)
|
|||||||
kfree(ax25_ctrls);
|
kfree(ax25_ctrls);
|
||||||
ax25_ctrls = NULL;
|
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);
|
printk(KERN_ERR "mkiss: can't unregister line discipline (err = %d)\n", i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -626,7 +626,7 @@ static void __exit irtty_sir_cleanup(void)
|
|||||||
{
|
{
|
||||||
int err;
|
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",
|
IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n",
|
||||||
__FUNCTION__, err);
|
__FUNCTION__, err);
|
||||||
}
|
}
|
||||||
|
@ -1025,7 +1025,7 @@ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
|
|||||||
|
|
||||||
static void __exit ppp_async_cleanup(void)
|
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");
|
printk(KERN_ERR "failed to unregister PPP line discipline\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -793,7 +793,7 @@ err:
|
|||||||
static void __exit
|
static void __exit
|
||||||
ppp_sync_cleanup(void)
|
ppp_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");
|
printk(KERN_ERR "failed to unregister Sync PPP line discipline\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1430,7 +1430,7 @@ static void __exit slip_exit(void)
|
|||||||
kfree(slip_devs);
|
kfree(slip_devs);
|
||||||
slip_devs = NULL;
|
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);
|
printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
|
||||||
}
|
}
|
||||||
|
@ -829,7 +829,7 @@ static void __exit exit_x25_asy(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
kfree(x25_asy_devs);
|
kfree(x25_asy_devs);
|
||||||
tty_register_ldisc(N_X25, NULL);
|
tty_unregister_ldisc(N_X25);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(init_x25_asy);
|
module_init(init_x25_asy);
|
||||||
|
@ -2828,7 +2828,7 @@ static void __exit strip_exit_driver(void)
|
|||||||
/* Unregister with the /proc/net file here. */
|
/* Unregister with the /proc/net file here. */
|
||||||
proc_net_remove("strip");
|
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(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);
|
||||||
|
|
||||||
printk(signoff);
|
printk(signoff);
|
||||||
|
Loading…
Reference in New Issue
Block a user