Commit 0e6357c3 authored by наб's avatar наб Committed by Greg Kroah-Hartman
Browse files

tty: synclink_gt: remove MGSL_MAGIC 



According to Greg, in the context of magic numbers as defined in
magic-number.rst, "the tty layer should not need this and I'll gladly
take patches"

Acked-by: default avatarJiri Slaby <jirislaby@kernel.org>
Signed-off-by: default avatarAhelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Ref: https://lore.kernel.org/linux-doc/YyMlovoskUcHLEb7@kroah.com/
Link: https://lore.kernel.org/r/3d82b3c864970cdec6717c56dd906b54e78694d7.1663288066.git.nabijaczleweli@nabijaczleweli.xyz


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

Documentation/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ SLIP_MAGIC 0x5302 slip ``drivers/net/sl 
STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``

AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

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

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ SLIP_MAGIC 0x5302 slip ``drivers/net/sl 
STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``

AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

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

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ SLIP_MAGIC 0x5302 slip ``drivers/net/sl 
STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``

AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

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

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ SLIP_MAGIC 0x5302 slip ``drivers/net/sl 
STRIP_MAGIC           0x5303           strip                    ``drivers/net/strip.c``

SIXPACK_MAGIC         0x5304           sixpack                  ``drivers/net/hamradio/6pack.h``

AX25_MAGIC            0x5316           ax_disp                  ``drivers/net/mkiss.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

drivers/tty/synclink_gt.c

+0 −8
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static char *driver_name = "SyncLink GT"; 
static char *slgt_driver_name = "synclink_gt";

static char *tty_dev_prefix  = "ttySLG";

MODULE_LICENSE("GPL");

#define MGSL_MAGIC 0x5401

#define MAX_DEVICES 32



static const struct pci_device_id pci_table[] = {
@@ -215,8 +214,6 @@ struct slgt_info { 


	struct slgt_info *next_device;	/* device list link */



	int magic;



	char device_name[25];

	struct pci_dev *pdev;
@@ -554,10 +551,6 @@ static inline int sanity_check(struct slgt_info *info, char *devname, const char 
		printk("null struct slgt_info for (%s) in %s\n", devname, name);

		return 1;

	}

	if (info->magic != MGSL_MAGIC) {

		printk("bad magic number struct slgt_info (%s) in %s\n", devname, name);

		return 1;

	}

#else

	if (!info)

		return 1;
@@ -3499,7 +3492,6 @@ static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev 
	} else {

		tty_port_init(&info->port);

		info->port.ops = &slgt_port_ops;

		info->magic = MGSL_MAGIC;

		INIT_WORK(&info->task, bh_handler);

		info->max_frame_size = 4096;

		info->base_clock = 14745600;