tty: do not check tty_unregister_driver's return value

These drivers check tty_unregister_driver return value. But they don't
handle a failure correctly (they free the driver in any case). So stop
checking tty_unregister_driver return value and remove also the prints.

In the next patch, tty_unregister_driver's return type will be switched
to void.

Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Cc: Jiri Kosina <jikos@kernel.org>
Cc: David Sterba <dsterba@suse.com>
Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210302062214.29627-34-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 1e215cf5ad03bb6cdd75a30f90e3fc4ce7a2d01d..a3dda25a4e45ee9f9e4a993aa279db68e06118d2 100644 (file)
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -171,11 +171,7 @@ static int __init rs_init(void)
 
 static __exit void rs_exit(void)
 {
-       int error;
-
-       if ((error = tty_unregister_driver(serial_driver)))
-               pr_err("ISS_SERIAL: failed to unregister serial driver (%d)\n",
-                      error);
+       tty_unregister_driver(serial_driver);
        put_tty_driver(serial_driver);
        tty_port_destroy(&serial_port);
 }

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 18b78ea110ef47ad00a59cd854b7e8e1feebf44c..0c8157fab17fad1dc4904ca212e4a2ca5e076ed0 100644 (file)
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1622,21 +1622,17 @@ fail_put_tty_driver:
 
 static int __exit amiga_serial_remove(struct platform_device *pdev)
 {
-       int error;
        struct serial_state *state = platform_get_drvdata(pdev);
 
        /* printk("Unloading %s: version %s\n", serial_name, serial_version); */
-       error = tty_unregister_driver(serial_driver);
-       if (error)
-               printk("SERIAL: failed to unregister serial driver (%d)\n",
-                      error);
+       tty_unregister_driver(serial_driver);
        put_tty_driver(serial_driver);
        tty_port_destroy(&state->tport);
 
        free_irq(IRQ_AMIGA_TBE, state);
        free_irq(IRQ_AMIGA_RBF, state);
 
-       return error;
+       return 0;
 }
 
 static struct platform_driver amiga_serial_driver = {

diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 6dacbc5e286c1092b5a4a0c92149355ae2360c5d..1836746991b5f4bbfb619e1274882b42ae0ae39e 100644 (file)
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -596,13 +596,8 @@ int ipwireless_tty_init(void)
 
 void ipwireless_tty_release(void)
 {
-       int ret;
-
-       ret = tty_unregister_driver(ipw_tty_driver);
+       tty_unregister_driver(ipw_tty_driver);
        put_tty_driver(ipw_tty_driver);
-       if (ret != 0)
-               printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                       ": tty_unregister_driver failed with code %d\n", ret);
 }
 
 int ipwireless_tty_is_modem(struct ipw_tty *tty)

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 9f13f7d49dd78874283efbb3a0286a776b882dc3..32eb6b5e510f059cb20763883d25ea85b4d9642c 100644 (file)
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1118,9 +1118,7 @@ static void __exit moxa_exit(void)
 
        del_timer_sync(&moxaTimer);
 
-       if (tty_unregister_driver(moxaDriver))
-               printk(KERN_ERR "Couldn't unregister MOXA Intellio family "
-                               "serial driver\n");
+       tty_unregister_driver(moxaDriver);
        put_tty_driver(moxaDriver);
 }
 

diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
index 6004c0c1d173e6b4f9e5ba2f3be5ebbc76ffdbaa..db059b66438e1de6ad090a5cffca799c85567e61 100644 (file)
--- a/drivers/tty/serial/kgdb_nmi.c
+++ b/drivers/tty/serial/kgdb_nmi.c
@@ -373,9 +373,7 @@ int kgdb_unregister_nmi_console(void)
        if (ret)
                return ret;
 
-       ret = tty_unregister_driver(kgdb_nmi_tty_driver);
-       if (ret)
-               return ret;
+       tty_unregister_driver(kgdb_nmi_tty_driver);
        put_tty_driver(kgdb_nmi_tty_driver);
 
        return 0;

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 644173786bf0decb29e472390129aeb240d21833..4727a41158b04d2b75825df38f291323962ed164 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3705,7 +3705,6 @@ static const struct tty_operations ops = {
 
 static void slgt_cleanup(void)
 {
-       int rc;
        struct slgt_info *info;
        struct slgt_info *tmp;
 
@@ -3714,9 +3713,7 @@ static void slgt_cleanup(void)
        if (serial_driver) {
                for (info=slgt_device_list ; info != NULL ; info=info->next_device)
                        tty_unregister_device(serial_driver, info->line);
-               rc = tty_unregister_driver(serial_driver);
-               if (rc)
-                       DBGERR(("tty_unregister_driver error=%d\n", rc));
+               tty_unregister_driver(serial_driver);
                put_tty_driver(serial_driver);
        }