Commit fba67e8f authored by Pascal Terjan's avatar Pascal Terjan Committed by Greg Kroah-Hartman
Browse files

Remove every trace of SERIAL_MAGIC 



This means removing support for checking magic in amiserial.c
(SERIAL_PARANOIA_CHECK option), which was checking a magic field which
doesn't currently exist in the struct. That code hasn't built at least
since git.

Removing the definition from the header is safe anyway as that code was
from another driver and not including it.

Signed-off-by: default avatarPascal Terjan <pterjan@google.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20191105192749.67533-1-pterjan@google.com


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

Documentation/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip 
ISICOM_MAGIC          0x4d54           isi_port                 ``include/linux/isicom.h``

PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``

PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``

SERIAL_MAGIC          0x5301           async_struct             ``include/linux/serial.h``

SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``

SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``

STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

Documentation/translations/it_IT/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip 
ISICOM_MAGIC          0x4d54           isi_port                 ``include/linux/isicom.h``

PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``

PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``

SERIAL_MAGIC          0x5301           async_struct             ``include/linux/serial.h``

SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``

SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``

STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

Documentation/translations/zh_CN/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ FF_MAGIC 0x4646 fc_info ``drivers/net/ip 
ISICOM_MAGIC          0x4d54           isi_port                 ``include/linux/isicom.h``

PTY_MAGIC             0x5001                                    ``drivers/char/pty.c``

PPP_MAGIC             0x5002           ppp                      ``include/linux/if_pppvar.h``

SERIAL_MAGIC          0x5301           async_struct             ``include/linux/serial.h``

SSTATE_MAGIC          0x5302           serial_state             ``include/linux/serial.h``

SLIP_MAGIC            0x5302           slip                     ``drivers/net/slip.h``

STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

drivers/net/wan/z85230.h

+0 −2
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ extern struct z8530_irqhandler z8530_sync, z8530_async, z8530_nop; 
 *	Asynchronous Interfacing

 */



#define SERIAL_MAGIC 0x5301



/*

 * The size of the serial xmit buffer is 1 page, or 4096 bytes

 */

drivers/tty/amiserial.c

+0 −84
Original line number Diff line number Diff line
@@ -22,18 +22,8 @@ 
 *

 */



/*

 * Serial driver configuration section.  Here are the various options:

 *

 * SERIAL_PARANOIA_CHECK

 * 		Check the magic number for the async_structure where

 * 		ever possible.

 */



#include <linux/delay.h>



#undef SERIAL_PARANOIA_CHECK



/* Set of debugging defines */



#undef SERIAL_DEBUG_INTR
@@ -132,28 +122,6 @@ static struct serial_state rs_table[1]; 


#define serial_isroot()	(capable(CAP_SYS_ADMIN))





static inline int serial_paranoia_check(struct serial_state *info,

					char *name, const char *routine)

{

#ifdef SERIAL_PARANOIA_CHECK

	static const char *badmagic =

		"Warning: bad magic number for serial struct (%s) in %s\n";

	static const char *badinfo =

		"Warning: null async_struct for (%s) in %s\n";



	if (!info) {

		printk(badinfo, name, routine);

		return 1;

	}

	if (info->magic != SERIAL_MAGIC) {

		printk(badmagic, name, routine);

		return 1;

	}

#endif

	return 0;

}



/* some serial hardware definitions */

#define SDR_OVRUN   (1<<15)

#define SDR_RBF     (1<<14)
@@ -189,9 +157,6 @@ static void rs_stop(struct tty_struct *tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_stop"))

		return;



	local_irq_save(flags);

	if (info->IER & UART_IER_THRI) {

		info->IER &= ~UART_IER_THRI;
@@ -209,9 +174,6 @@ static void rs_start(struct tty_struct *tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_start"))

		return;



	local_irq_save(flags);

	if (info->xmit.head != info->xmit.tail

	    && info->xmit.buf
@@ -783,9 +745,6 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) 


	info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_put_char"))

		return 0;



	if (!info->xmit.buf)

		return 0;
@@ -808,9 +767,6 @@ static void rs_flush_chars(struct tty_struct *tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))

		return;



	if (info->xmit.head == info->xmit.tail

	    || tty->stopped

	    || tty->hw_stopped
@@ -833,9 +789,6 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_write"))

		return 0;



	if (!info->xmit.buf)

		return 0;
@@ -878,8 +831,6 @@ static int rs_write_room(struct tty_struct *tty) 
{

	struct serial_state *info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_write_room"))

		return 0;

	return CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);

}
@@ -887,8 +838,6 @@ static int rs_chars_in_buffer(struct tty_struct *tty) 
{

	struct serial_state *info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))

		return 0;

	return CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);

}
@@ -897,8 +846,6 @@ static void rs_flush_buffer(struct tty_struct *tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))

		return;

	local_irq_save(flags);

	info->xmit.head = info->xmit.tail = 0;

	local_irq_restore(flags);
@@ -914,9 +861,6 @@ static void rs_send_xchar(struct tty_struct *tty, char ch) 
	struct serial_state *info = tty->driver_data;

        unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_send_xchar"))

		return;



	info->x_char = ch;

	if (ch) {

		/* Make sure transmit interrupts are on */
@@ -952,9 +896,6 @@ static void rs_throttle(struct tty_struct * tty) 
	printk("throttle %s ....\n", tty_name(tty));

#endif



	if (serial_paranoia_check(info, tty->name, "rs_throttle"))

		return;



	if (I_IXOFF(tty))

		rs_send_xchar(tty, STOP_CHAR(tty));
@@ -974,9 +915,6 @@ static void rs_unthrottle(struct tty_struct * tty) 
	printk("unthrottle %s ....\n", tty_name(tty));

#endif



	if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))

		return;



	if (I_IXOFF(tty)) {

		if (info->x_char)

			info->x_char = 0;
@@ -1109,8 +1047,6 @@ static int rs_tiocmget(struct tty_struct *tty) 
	unsigned char control, status;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))

		return -ENODEV;

	if (tty_io_error(tty))

		return -EIO;
@@ -1131,8 +1067,6 @@ static int rs_tiocmset(struct tty_struct *tty, unsigned int set, 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))

		return -ENODEV;

	if (tty_io_error(tty))

		return -EIO;
@@ -1155,12 +1089,8 @@ static int rs_tiocmset(struct tty_struct *tty, unsigned int set, 
 */

static int rs_break(struct tty_struct *tty, int break_state)

{

	struct serial_state *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_break"))

		return -EINVAL;



	local_irq_save(flags);

	if (break_state == -1)

	  custom.adkcon = AC_SETCLR | AC_UARTBRK;
@@ -1212,9 +1142,6 @@ static int rs_ioctl(struct tty_struct *tty, 
	DEFINE_WAIT(wait);

	int ret;



	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))

		return -ENODEV;



	if ((cmd != TIOCSERCONFIG) &&

	    (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {

		if (tty_io_error(tty))
@@ -1333,9 +1260,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp) 
	struct serial_state *state = tty->driver_data;

	struct tty_port *port = &state->tport;



	if (serial_paranoia_check(state, tty->name, "rs_close"))

		return;



	if (tty_port_close_start(port, tty, filp) == 0)

		return;
@@ -1379,9 +1303,6 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) 
	unsigned long orig_jiffies, char_time;

	int lsr;



	if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent"))

		return;



	if (info->xmit_fifo_size == 0)

		return; /* Just in case.... */
@@ -1440,9 +1361,6 @@ static void rs_hangup(struct tty_struct *tty) 
{

	struct serial_state *info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_hangup"))

		return;



	rs_flush_buffer(tty);

	shutdown(tty, info);

	info->tport.count = 0;
@@ -1467,8 +1385,6 @@ static int rs_open(struct tty_struct *tty, struct file * filp) 
	port->tty = tty;

	tty->driver_data = info;

	tty->port = port;

	if (serial_paranoia_check(info, tty->name, "rs_open"))

		return -ENODEV;



	port->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE