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

tty: remove broken r3964 line discipline 



Noone stepped up in the past two years since it was marked as BROKEN by
commit c7084edc (tty: mark Siemens R3964 line discipline as BROKEN).
Remove the line discipline for good.

Three remarks:
* we remove also the uapi header (as noone is able to use that interface
  anyway)
* we do *not* remove the N_R3964 constant definition from tty.h, so it
  remains reserved.
* in_interrupt() check is now removed from vt's con_put_char. Noone else
  calls tty_operations::put_char from interrupt context.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210505091928.22010-2-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7e325aa

arch/powerpc/configs/ppc6xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -621,7 +621,6 @@ CONFIG_HW_RANDOM=y 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_NVRAM=y

CONFIG_DTLK=m

CONFIG_R3964=m

CONFIG_CARDMAN_4000=m

CONFIG_CARDMAN_4040=m

CONFIG_IPWIRELESS=m

drivers/char/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -218,19 +218,6 @@ config XILINX_HWICAP 


	  If unsure, say N.



config R3964

	tristate "Siemens R3964 line discipline"

	depends on TTY && BROKEN

	help

	  This driver allows synchronous communication with devices using the

	  Siemens R3964 packet protocol. Unless you are dealing with special

	  hardware like PLCs, you are unlikely to need this.



	  To compile this driver as a module, choose M here: the

	  module will be called n_r3964.



	  If unsure, say N.



config APPLICOM

	tristate "Applicom intelligent fieldbus card support"

	depends on PCI

drivers/tty/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ obj-$(CONFIG_AUDIT) += tty_audit.o 
obj-$(CONFIG_MAGIC_SYSRQ)	+= sysrq.o

obj-$(CONFIG_N_HDLC)		+= n_hdlc.o

obj-$(CONFIG_N_GSM)		+= n_gsm.o

obj-$(CONFIG_R3964)		+= n_r3964.o



obj-y				+= vt/

obj-$(CONFIG_HVC_DRIVER)	+= hvc/

drivers/tty/n_r3964.c

deleted100644 → 0
+0 −1283

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/tty/vt/vt.c

+0 −2
Original line number Diff line number Diff line
@@ -3260,8 +3260,6 @@ static int con_write(struct tty_struct *tty, const unsigned char *buf, int count 


static int con_put_char(struct tty_struct *tty, unsigned char ch)

{

	if (in_interrupt())

		return 0;	/* n_r3964 calls put_char() from interrupt context */

	return do_con_write(tty, &ch, 1);

}