mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <jslaby@suse.cz>
Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Kirk Reiser <kirk@reisers.ca>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rodolfo Giometti <giometti@enneenne.com>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Link: https://lore.kernel.org/r/20210505091928.22010-19-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2021-05-05 11:19:11 +02:00 committed by Greg Kroah-Hartman
parent 1947520933
commit 357a6a875f
13 changed files with 15 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/accessibility/speakup/spk_ttyio.c
View File

@ -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)

7
drivers/bluetooth/hci_ldisc.c
View File

@ -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);

12
drivers/misc/ti-st/st_core.c
View File

@ -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);
}

4
drivers/net/can/slcan.c
View File

@ -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);

8
drivers/net/hamradio/6pack.c
View File

@ -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 */

8
drivers/net/hamradio/mkiss.c
View File

@ -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 <ralf@linux-mips.org>");

3
drivers/net/ppp/ppp_async.c
View File

@ -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);

3
drivers/net/ppp/ppp_synctty.c
View File

@ -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);

4
drivers/net/slip/slip.c
View File

@ -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);

8
drivers/pps/clients/pps-ldisc.c
View File

@ -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);

5
drivers/tty/n_gsm.c
View File

@ -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);
}

8
drivers/tty/n_hdlc.c
View File

@ -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);

4
sound/soc/ti/ams-delta.c
View File

@ -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;