Commit 357a6a87 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19475209

drivers/accessibility/speakup/spk_ttyio.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/bluetooth/hci_ldisc.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

drivers/misc/ti-st/st_core.c

+3 −9
Original line number Diff line number Diff line
@@ -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);

	}

drivers/net/can/slcan.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/hamradio/6pack.c

+1 −7
Original line number Diff line number Diff line
@@ -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 */