On Tue, 25 Oct 2022, Martin Hundebøll wrote: > The 8250 module has been updated allow configurations with zero builtin > UART ports, so change the description of the parameter to reflect that. > > Signed-off-by: Martin Hundebøll <martin@xxxxxxxxxx> > --- > > Change since v2: > * new patch > > drivers/tty/serial/8250/8250_core.c | 3 ++- > drivers/tty/serial/8250/Kconfig | 10 +++++----- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c > index a8fbc2325244..3d8bf0296080 100644 > --- a/drivers/tty/serial/8250/8250_core.c > +++ b/drivers/tty/serial/8250/8250_core.c > @@ -1257,7 +1257,8 @@ module_param_hw(share_irqs, uint, other, 0644); > MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)"); > > module_param(nr_uarts, uint, 0644); > -MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); > +MODULE_PARM_DESC(nr_uarts, "Number of built-in (non-discoverable) UARTs to initialize. (1-" > + _MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); This fails to build. You have dropped the second underscore for some reason. Shouldn't that 1- be also changed to 0- ? -- i. > > module_param(skip_txen_test, uint, 0644); > MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time"); > diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig > index d0b49e15fbf5..65ef03553146 100644 > --- a/drivers/tty/serial/8250/Kconfig > +++ b/drivers/tty/serial/8250/Kconfig > @@ -191,15 +191,15 @@ config SERIAL_8250_NR_UARTS > via hot-plug, or any ISA multi-port serial cards. > > config SERIAL_8250_RUNTIME_UARTS > - int "Number of 8250/16550 serial ports to register at runtime" > + int "Number of built-in (non-discoverable) UARTs to initialize at boot time" > depends on SERIAL_8250 > range 0 SERIAL_8250_NR_UARTS > default "4" > help > - Set this to the maximum number of serial ports you want > - the kernel to register at boot time. This can be overridden > - with the module parameter "nr_uarts", or boot-time parameter > - 8250.nr_uarts > + Set this to the maximum number of built-in (non-discoverable) serial > + ports you want the kernel to initialize at boot time. This can be > + overridden with the module parameter "nr_uarts", or boot-time > + parameter 8250.nr_uarts > > config SERIAL_8250_EXTENDED > bool "Extended 8250/16550 serial driver options" >
