Skip to content

Commit 9b22596

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
serial: 8250: move skip_txen_test to core
8250_core is the only place where skip_txen_test is used. And platform and core end up in 8250.ko, so there is no change in module name (param prefix). Therefore, move skip_txen_test there and make it local. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Link: https://patch.msgid.link/20251119092457.826789-5-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 37d55c9 commit 9b22596

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/tty/serial/8250/8250.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ extern unsigned int nr_uarts;
105105
#endif
106106

107107
extern unsigned int share_irqs;
108-
extern unsigned int skip_txen_test;
109108

110109
#define SERIAL8250_PORT_FLAGS(_base, _irq, _flags) \
111110
{ \

drivers/tty/serial/8250/8250_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ struct irq_info {
5252
static DEFINE_HASHTABLE(irq_lists, IRQ_HASH_BITS);
5353
static DEFINE_MUTEX(hash_mutex); /* Used to walk the hash */
5454

55+
static bool skip_txen_test;
56+
module_param(skip_txen_test, bool, 0644);
57+
MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
58+
5559
/*
5660
* This is the serial driver's interrupt routine.
5761
*

drivers/tty/serial/8250/8250_platform.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
* Configuration:
3030
* share_irqs: Whether we pass IRQF_SHARED to request_irq().
3131
* This option is unsafe when used on edge-triggered interrupts.
32-
* skip_txen_test: Force skip of txen test at init time.
3332
*/
3433
unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
35-
unsigned int skip_txen_test;
3634

3735
unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
3836

@@ -386,7 +384,4 @@ MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsa
386384
module_param(nr_uarts, uint, 0644);
387385
MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
388386

389-
module_param(skip_txen_test, uint, 0644);
390-
MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
391-
392387
MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);

0 commit comments

Comments
 (0)