Re: [PATCH 2/5] tty: remove TTY_DRIVER_MAGIC

Jiri Slaby
2022-09-16T06:51:44Z

On 16. 09. 22, 3:55, наб wrote:
> 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"
>
> Ref: https://lore.kernel.org/linux-doc/YyMlovoskUcHLEb7@kroah.com/
> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>

Acked-by: Jiri Slaby <jirislaby@kernel.org>

> ---
> Documentation/process/magic-number.rst | 1 -
> Documentation/translations/it_IT/process/magic-number.rst | 1 -
> Documentation/translations/zh_CN/process/magic-number.rst | 1 -
> Documentation/translations/zh_TW/process/magic-number.rst | 1 -
> drivers/tty/tty_io.c | 1 -
> include/linux/tty_driver.h | 5 -----
> 6 files changed, 10 deletions(-)
>
> diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst
> index b4c7ec61437e..d47799ba0ca4 100644
> --- a/Documentation/process/magic-number.rst
> +++ b/Documentation/process/magic-number.rst
> @@ -85,7 +85,6 @@ STRIP_MAGIC 0x5303 strip ``drivers/net/st
> 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``
> -TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> 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``
> diff --git a/Documentation/translations/it_IT/process/magic-number.rst b/Documentation/translations/it_IT/process/magic-number.rst
> index bcb23384fefd..24022ab52ebb 100644
> --- a/Documentation/translations/it_IT/process/magic-number.rst
> +++ b/Documentation/translations/it_IT/process/magic-number.rst
> @@ -91,7 +91,6 @@ STRIP_MAGIC 0x5303 strip ``drivers/net/st
> 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``
> -TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> 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``
> diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst
> index 6250087d36c5..811804996283 100644
> --- a/Documentation/translations/zh_CN/process/magic-number.rst
> +++ b/Documentation/translations/zh_CN/process/magic-number.rst
> @@ -74,7 +74,6 @@ STRIP_MAGIC 0x5303 strip ``drivers/net/st
> 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``
> -TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> 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``
> diff --git a/Documentation/translations/zh_TW/process/magic-number.rst b/Documentation/translations/zh_TW/process/magic-number.rst
> index fd169d760bbd..8e37e00590f5 100644
> --- a/Documentation/translations/zh_TW/process/magic-number.rst
> +++ b/Documentation/translations/zh_TW/process/magic-number.rst
> @@ -77,7 +77,6 @@ STRIP_MAGIC 0x5303 strip ``drivers/net/st
> 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``
> -TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> 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``
> diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
> index 33962109bd10..d036fc59a2e8 100644
> --- a/drivers/tty/tty_io.c
> +++ b/drivers/tty/tty_io.c
> @@ -3321,7 +3321,6 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
> return ERR_PTR(-ENOMEM);
>
> kref_init(&driver->kref);
> - driver->magic = TTY_DRIVER_MAGIC;
> driver->num = lines;
> driver->owner = owner;
> driver->flags = flags;
> diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
> index 4841d8069c07..b0421f5de8a6 100644
> --- a/include/linux/tty_driver.h
> +++ b/include/linux/tty_driver.h
> @@ -396,7 +396,6 @@ struct tty_operations {
> /**
> * struct tty_driver -- driver for TTY devices
> *
> - * @magic: set to %TTY_DRIVER_MAGIC in __tty_alloc_driver()
> * @kref: reference counting. Reaching zero frees all the internals and the
> * driver.
> * @cdevs: allocated/registered character /dev devices
> @@ -432,7 +431,6 @@ struct tty_operations {
> * @driver_name, @name, @type, @subtype, @init_termios, and @ops.
> */
> struct tty_driver {
> - int magic;
> struct kref kref;
> struct cdev **cdevs;
> struct module *owner;
> @@ -489,9 +487,6 @@ static inline void tty_set_operations(struct tty_driver *driver,
> driver->ops = op;
> }
>
> -/* tty driver magic number */
> -#define TTY_DRIVER_MAGIC 0x5402
> -
> /**
> * DOC: TTY Driver Flags
> *

--
js
suse labs