Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tty: hvc: remove HVC_IUCV_MAGIC

Browse Source 
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"

This stretches that definition slightly, since it multiplexes it with
the terminal number as a constant offset, but is equivalent

Acked-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Ref: https://lore.kernel.org/linux-doc/YyMlovoskUcHLEb7@kroah.com/
Link: https://lore.kernel.org/r/8c8a2c9dfc1bfbe6ef3f3237368e483865fc1c29.1663288066.git.nabijaczleweli@nabijaczleweli.xyz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
наб 2022-09-16 03:55:18 +02:00 committed by Greg Kroah-Hartman
parent 0e6357c3b6
commit eef7381d81
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/hvc/hvc_iucv.c
View File

@ -29,7 +29,6 @@
/* General device driver settings */ /* General device driver settings */
#define HVC_IUCV_MAGIC 0xc9e4c3e5
#define MAX_HVC_IUCV_LINES HVC_ALLOC_TTY_ADAPTERS #define MAX_HVC_IUCV_LINES HVC_ALLOC_TTY_ADAPTERS
#define MEMPOOL_MIN_NR (PAGE_SIZE / sizeof(struct iucv_tty_buffer)/4) #define MEMPOOL_MIN_NR (PAGE_SIZE / sizeof(struct iucv_tty_buffer)/4)
@ -131,9 +130,9 @@ static struct iucv_handler hvc_iucv_handler = {
*/ */
static struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num) static struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
{ {
if ((num < HVC_IUCV_MAGIC) || (num - HVC_IUCV_MAGIC > hvc_iucv_devices)) if (num > hvc_iucv_devices)
return NULL; return NULL;
return hvc_iucv_table[num - HVC_IUCV_MAGIC]; return hvc_iucv_table[num];
} }
/** /**
@ -1072,8 +1071,8 @@ static int __init hvc_iucv_alloc(int id, unsigned int is_console)
priv->is_console = is_console; priv->is_console = is_console;
/* allocate hvc device */ /* allocate hvc device */
priv->hvc = hvc_alloc(HVC_IUCV_MAGIC + id, /* PAGE_SIZE */ priv->hvc = hvc_alloc(id, /* PAGE_SIZE */
HVC_IUCV_MAGIC + id, &hvc_iucv_ops, 256); id, &hvc_iucv_ops, 256);
if (IS_ERR(priv->hvc)) { if (IS_ERR(priv->hvc)) {
rc = PTR_ERR(priv->hvc); rc = PTR_ERR(priv->hvc);
goto out_error_hvc; goto out_error_hvc;
@ -1371,7 +1370,7 @@ static int __init hvc_iucv_init(void)
/* register the first terminal device as console /* register the first terminal device as console
* (must be done before allocating hvc terminal devices) */ * (must be done before allocating hvc terminal devices) */
rc = hvc_instantiate(HVC_IUCV_MAGIC, IUCV_HVC_CON_IDX, &hvc_iucv_ops); rc = hvc_instantiate(0, IUCV_HVC_CON_IDX, &hvc_iucv_ops);
if (rc) { if (rc) {
pr_err("Registering HVC terminal device as " pr_err("Registering HVC terminal device as "
"Linux console failed\n"); "Linux console failed\n");