From: Alexey Dobriyan <adobriyan@gmail.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Convert users to tty_unregister_ldisc()
Date: Tue, 31 May 2005 23:57:20 +0400 [thread overview]
Message-ID: <200505312357.21062.adobriyan@gmail.com> (raw)
tty_register_ldisc(N_FOO, NULL) => tty_unregister_ldisc(N_FOO)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
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(-)
diff -uprN linux-tty_register_ldisc_001/drivers/bluetooth/hci_ldisc.c linux-tty_register_ldisc_002/drivers/bluetooth/hci_ldisc.c
--- linux-tty_register_ldisc_001/drivers/bluetooth/hci_ldisc.c 2005-05-31 20:13:29.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/bluetooth/hci_ldisc.c 2005-05-31 23:30:50.000000000 +0400
@@ -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);
}
diff -uprN linux-tty_register_ldisc_001/drivers/char/n_hdlc.c linux-tty_register_ldisc_002/drivers/char/n_hdlc.c
--- linux-tty_register_ldisc_001/drivers/char/n_hdlc.c 2005-05-31 20:13:33.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/char/n_hdlc.c 2005-05-31 23:29:30.000000000 +0400
@@ -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);
diff -uprN linux-tty_register_ldisc_001/drivers/char/n_r3964.c linux-tty_register_ldisc_002/drivers/char/n_r3964.c
--- linux-tty_register_ldisc_001/drivers/char/n_r3964.c 2005-05-31 20:13:33.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/char/n_r3964.c 2005-05-31 23:29:55.000000000 +0400
@@ -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)
{
diff -uprN linux-tty_register_ldisc_001/drivers/input/serio/serport.c linux-tty_register_ldisc_002/drivers/input/serio/serport.c
--- linux-tty_register_ldisc_001/drivers/input/serio/serport.c 2005-05-31 20:13:40.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/input/serio/serport.c 2005-05-31 23:30:21.000000000 +0400
@@ -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);
diff -uprN linux-tty_register_ldisc_001/drivers/net/hamradio/6pack.c linux-tty_register_ldisc_002/drivers/net/hamradio/6pack.c
--- linux-tty_register_ldisc_001/drivers/net/hamradio/6pack.c 2005-05-31 20:13:52.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/hamradio/6pack.c 2005-05-31 23:28:22.000000000 +0400
@@ -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);
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/hamradio/mkiss.c linux-tty_register_ldisc_002/drivers/net/hamradio/mkiss.c
--- linux-tty_register_ldisc_001/drivers/net/hamradio/mkiss.c 2005-05-31 20:13:52.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/hamradio/mkiss.c 2005-05-31 23:27:53.000000000 +0400
@@ -934,7 +934,7 @@ static void __exit mkiss_exit_driver(voi
kfree(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);
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/irda/irtty-sir.c linux-tty_register_ldisc_002/drivers/net/irda/irtty-sir.c
--- linux-tty_register_ldisc_001/drivers/net/irda/irtty-sir.c 2005-05-31 20:13:53.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/irda/irtty-sir.c 2005-05-31 23:26:38.000000000 +0400
@@ -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);
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/ppp_async.c linux-tty_register_ldisc_002/drivers/net/ppp_async.c
--- linux-tty_register_ldisc_001/drivers/net/ppp_async.c 2005-05-31 20:13:54.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/ppp_async.c 2005-05-31 23:27:26.000000000 +0400
@@ -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");
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/ppp_synctty.c linux-tty_register_ldisc_002/drivers/net/ppp_synctty.c
--- linux-tty_register_ldisc_001/drivers/net/ppp_synctty.c 2005-05-31 20:13:54.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/ppp_synctty.c 2005-05-31 23:27:04.000000000 +0400
@@ -793,7 +793,7 @@ err:
static void __exit
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");
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/slip.c linux-tty_register_ldisc_002/drivers/net/slip.c
--- linux-tty_register_ldisc_001/drivers/net/slip.c 2005-05-31 20:13:56.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/slip.c 2005-05-31 23:28:43.000000000 +0400
@@ -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);
}
diff -uprN linux-tty_register_ldisc_001/drivers/net/wan/x25_asy.c linux-tty_register_ldisc_002/drivers/net/wan/x25_asy.c
--- linux-tty_register_ldisc_001/drivers/net/wan/x25_asy.c 2005-05-31 20:13:57.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/wan/x25_asy.c 2005-05-31 23:26:07.000000000 +0400
@@ -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);
diff -uprN linux-tty_register_ldisc_001/drivers/net/wireless/strip.c linux-tty_register_ldisc_002/drivers/net/wireless/strip.c
--- linux-tty_register_ldisc_001/drivers/net/wireless/strip.c 2005-05-31 20:13:58.000000000 +0400
+++ linux-tty_register_ldisc_002/drivers/net/wireless/strip.c 2005-05-31 23:29:01.000000000 +0400
@@ -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);
next reply other threads:[~2005-05-31 19:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-31 19:57 Alexey Dobriyan [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-06-15 21:42 [PATCH 2/2] Convert users to tty_unregister_ldisc() Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200505312357.21062.adobriyan@gmail.com \
--to=adobriyan@gmail.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.