tty: no checking of tty_unregister_ldisc

tty_unregister_ldisc now returns 0 = success. No need to check the
return value. In fact, the users only warned if an error occured and
didn't do anything useful anyway -- the ldisc module was unloaded in any
case.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: William Hubbs <[email protected]>
Cc: Chris Brannon <[email protected]>
Cc: Kirk Reiser <[email protected]>
Cc: Samuel Thibault <[email protected]>
Cc: Marcel Holtmann <[email protected]>
Cc: Johan Hedberg <[email protected]>
Cc: Luiz Augusto von Dentz <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Wolfgang Grandegger <[email protected]>
Cc: Marc Kleine-Budde <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Andreas Koensgen <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Rodolfo Giometti <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/accessibility/speakup/spk_ttyio.c b/drivers/accessibility/speakup/spk_ttyio.c
index 0b7f1a87eaeb48d326ccfa0c69260b97170f0097..0d1f397cd8961fe4c4f8da3f4c286d512ee2cc54 100644 (file)
--- a/drivers/accessibility/speakup/spk_ttyio.c
+++ b/drivers/accessibility/speakup/spk_ttyio.c
@@ -219,8 +219,7 @@ void spk_ttyio_register_ldisc(void)
 
 void spk_ttyio_unregister_ldisc(void)
 {
-       if (tty_unregister_ldisc(&spk_ttyio_ldisc_ops))
-               pr_warn("speakup: Couldn't unregister ldisc\n");
+       tty_unregister_ldisc(&spk_ttyio_ldisc_ops);
 }
 
 static int spk_ttyio_out(struct spk_synth *in_synth, const char ch)

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 31e0c804363c51a546d1a05048f19eddbcf90980..5ed2cfa7da1d9e116198f3742ef29d53cb4128cb 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -883,8 +883,6 @@ static int __init hci_uart_init(void)
 
 static void __exit hci_uart_exit(void)
 {
-       int err;
-
 #ifdef CONFIG_BT_HCIUART_H4
        h4_deinit();
 #endif
@@ -916,10 +914,7 @@ static void __exit hci_uart_exit(void)
        mrvl_deinit();
 #endif
 
-       /* Release tty registration of line discipline */
-       err = tty_unregister_ldisc(&hci_uart_ldisc);
-       if (err)
-               BT_ERR("Can't unregister HCI line discipline (%d)", err);
+       tty_unregister_ldisc(&hci_uart_ldisc);
 }
 
 module_init(hci_uart_init);

diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index 174ae8e52805857433e3307908667006771b81b0..85315e72664440c57175365c6229f484909f5eeb 100644 (file)
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -872,9 +872,7 @@ int st_core_init(struct st_data_s **core_data)
        st_gdata = kzalloc(sizeof(struct st_data_s), GFP_KERNEL);
        if (!st_gdata) {
                pr_err("memory allocation failed");
-               err = tty_unregister_ldisc(&st_ldisc_ops);
-               if (err)
-                       pr_err("unable to un-register ldisc %ld", err);
+               tty_unregister_ldisc(&st_ldisc_ops);
                err = -ENOMEM;
                return err;
        }
@@ -892,9 +890,7 @@ int st_core_init(struct st_data_s **core_data)
        if (err) {
                pr_err("error during st_ll initialization(%ld)", err);
                kfree(st_gdata);
-               err = tty_unregister_ldisc(&st_ldisc_ops);
-               if (err)
-                       pr_err("unable to un-register ldisc");
+               tty_unregister_ldisc(&st_ldisc_ops);
                return err;
        }
 
@@ -919,9 +915,7 @@ void st_core_exit(struct st_data_s *st_gdata)
                kfree_skb(st_gdata->rx_skb);
                kfree_skb(st_gdata->tx_skb);
                /* TTY ldisc cleanup */
-               err = tty_unregister_ldisc(&st_ldisc_ops);
-               if (err)
-                       pr_err("unable to un-register ldisc %ld", err);
+               tty_unregister_ldisc(&st_ldisc_ops);
                /* free the global data pointer */
                kfree(st_gdata);
        }

diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 03a2dbd3c3672567018d7bb6476ab9886a0c0688..d42ec7d1bc1466b2c7d913739e8a20c952088aa8 100644 (file)
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -784,9 +784,7 @@ static void __exit slcan_exit(void)
        kfree(slcan_devs);
        slcan_devs = NULL;
 
-       i = tty_unregister_ldisc(&slc_ldisc);
-       if (i)
-               printk(KERN_ERR "slcan: can't unregister ldisc (err %d)\n", i);
+       tty_unregister_ldisc(&slc_ldisc);
 }
 
 module_init(slcan_init);

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index aac24f9caceb92c2a550abbe027631b2a9037325..686c38c46113bd17eae180f8437b8fb57017ec2d 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -774,15 +774,9 @@ static int __init sixpack_init_driver(void)
        return status;
 }
 
-static const char msg_unregfail[] = KERN_ERR \
-       "6pack: can't unregister line discipline (err = %d)\n";
-
 static void __exit sixpack_exit_driver(void)
 {
-       int ret;
-
-       if ((ret = tty_unregister_ldisc(&sp_ldisc)))
-               printk(msg_unregfail, ret);
+       tty_unregister_ldisc(&sp_ldisc);
 }
 
 /* encode an AX.25 packet into 6pack */

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 750c6afc930295c09cb1bebc198fed3206deaca8..e3294a0a9800542f64acf47d11dc0dd0aa1d31e9 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -960,15 +960,9 @@ static int __init mkiss_init_driver(void)
        return status;
 }
 
-static const char msg_unregfail[] = KERN_ERR \
-       "mkiss: can't unregister line discipline (err = %d)\n";
-
 static void __exit mkiss_exit_driver(void)
 {
-       int ret;
-
-       if ((ret = tty_unregister_ldisc(&ax_ldisc)))
-               printk(msg_unregfail, ret);
+       tty_unregister_ldisc(&ax_ldisc);
 }
 
 MODULE_AUTHOR("Ralf Baechle DL5RB <[email protected]>");

diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index b2d454d01ebaedbe82e1be360ce6fac762433e8d..29a93d6bfe37f87c0c97d91c2f1ee90fba21e2e7 100644 (file)
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -1016,8 +1016,7 @@ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
 
 static void __exit ppp_async_cleanup(void)
 {
-       if (tty_unregister_ldisc(&ppp_ldisc) != 0)
-               printk(KERN_ERR "failed to unregister PPP line discipline\n");
+       tty_unregister_ldisc(&ppp_ldisc);
 }
 
 module_init(ppp_async_init);

diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index ca403bde56fb8d123097f7ae556da62a546607f3..af3e048695b662f256c1d4e51c6427d2eb23fc18 100644 (file)
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -727,8 +727,7 @@ err:
 static void __exit
 ppp_sync_cleanup(void)
 {
-       if (tty_unregister_ldisc(&ppp_sync_ldisc) != 0)
-               printk(KERN_ERR "failed to unregister Sync PPP line discipline\n");
+       tty_unregister_ldisc(&ppp_sync_ldisc);
 }
 
 module_init(ppp_sync_init);

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 867efff40a0e8936b7471b6febdbecb956cde7e8..dc84cb844319a45f77c8753296e4b41618ff0b6c 100644 (file)
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -1360,9 +1360,7 @@ static void __exit slip_exit(void)
        kfree(slip_devs);
        slip_devs = NULL;
 
-       i = tty_unregister_ldisc(&sl_ldisc);
-       if (i != 0)
-               printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
+       tty_unregister_ldisc(&sl_ldisc);
 }
 
 module_init(slip_init);

diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c
index 91b947f37774c264bf028168d27c8437b8591b04..d73c4c2ed4e13aedb80c757d397e4846ae34d16e 100644 (file)
--- a/drivers/pps/clients/pps-ldisc.c
+++ b/drivers/pps/clients/pps-ldisc.c
@@ -129,13 +129,7 @@ static int __init pps_tty_init(void)
 
 static void __exit pps_tty_cleanup(void)
 {
-       int err;
-
-       err = tty_unregister_ldisc(&pps_ldisc_ops);
-       if (err)
-               pr_err("can't unregister PPS line discipline\n");
-       else
-               pr_info("PPS line discipline removed\n");
+       tty_unregister_ldisc(&pps_ldisc_ops);
 }
 
 module_init(pps_tty_init);

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index db7d4a30af91fda35e7532d2ca4b9c08aed9fd4b..157b26ef62599c2b6e24b94b0a4adc96667ff8ef 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3286,10 +3286,7 @@ err_unreg_ldisc:
 
 static void __exit gsm_exit(void)
 {
-       int status = tty_unregister_ldisc(&tty_ldisc_packet);
-       if (status != 0)
-               pr_err("n_gsm: can't unregister line discipline (err = %d)\n",
-                                                               status);
+       tty_unregister_ldisc(&tty_ldisc_packet);
        tty_unregister_driver(gsm_tty_driver);
        put_tty_driver(gsm_tty_driver);
 }

diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index c2afbfe0a1d57955e84df58f6702583e6c7db77c..d899ee4e0116f6831af2fc09ca2be2dbce528de6 100644 (file)
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -822,13 +822,7 @@ static int __init n_hdlc_init(void)
 
 static void __exit n_hdlc_exit(void)
 {
-       int status = tty_unregister_ldisc(&n_hdlc_ldisc);
-
-       if (status)
-               pr_err("N_HDLC: can't unregister line discipline (err = %d)\n",
-                               status);
-       else
-               pr_info("N_HDLC: line discipline unregistered\n");
+       tty_unregister_ldisc(&n_hdlc_ldisc);
 }
 
 module_init(n_hdlc_init);

diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c
index e89548e4836403f2a4ba9ffe32116d214c02c389..ecd24d412a9b01771bae50b6847059533ee1a921 100644 (file)
--- a/sound/soc/ti/ams-delta.c
+++ b/sound/soc/ti/ams-delta.c
@@ -583,9 +583,7 @@ static int ams_delta_remove(struct platform_device *pdev)
 {
        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-       if (tty_unregister_ldisc(&cx81801_ops) != 0)
-               dev_warn(&pdev->dev,
-                       "failed to unregister V253 line discipline\n");
+       tty_unregister_ldisc(&cx81801_ops);
 
        snd_soc_unregister_card(card);
        card->dev = NULL;