Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9196d8ac authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: 8250, revert module name change 



In 3.7 the 8250 module name was changed unintentionally from 8250 to
8250_core by commit 835d844d
(8250_pnp: do pnp probe before legacy probe). We then had to
re-introduce the old module options to ensure the old good
8250.nr_uart & co. still work. This can be done only by a very dirty
hack and we did it in f2b8dfd9
(serial: 8250: Keep 8250.<xxxx> module options functional after driver
rename).

That is so damn ugly so that I decided to revert to the old module
name and deprecate the new 8250_core options present in 3.7 and 3.8
only. The deprecation will happen in the following patch.

Note that this patch changes the hack above to support "8250_core.*",
because we now have "8250.*" natively.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b5c913f

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

+2 −2
Original line number Diff line number Diff line
@@ -3432,7 +3432,7 @@ MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR); 
static void __used s8250_options(void)

{

#undef MODULE_PARAM_PREFIX

#define MODULE_PARAM_PREFIX "8250."

#define MODULE_PARAM_PREFIX "8250_core."



	module_param_cb(share_irqs, &param_ops_uint, &share_irqs, 0644);

	module_param_cb(nr_uarts, &param_ops_uint, &nr_uarts, 0644);
@@ -3444,5 +3444,5 @@ static void __used s8250_options(void) 
#endif

}

#else

MODULE_ALIAS("8250");

MODULE_ALIAS("8250_core");

#endif

drivers/tty/serial/8250/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
# Makefile for the 8250 serial device drivers.

#



obj-$(CONFIG_SERIAL_8250)		+= 8250_core.o

8250_core-y				:= 8250.o

8250_core-$(CONFIG_SERIAL_8250_PNP)	+= 8250_pnp.o

8250_core-$(CONFIG_SERIAL_8250_DMA)	+= 8250_dma.o

obj-$(CONFIG_SERIAL_8250)		+= 8250.o

8250-y					:= 8250_core.o

8250-$(CONFIG_SERIAL_8250_PNP)		+= 8250_pnp.o

8250-$(CONFIG_SERIAL_8250_DMA)		+= 8250_dma.o

obj-$(CONFIG_SERIAL_8250_GSC)		+= 8250_gsc.o

obj-$(CONFIG_SERIAL_8250_PCI)		+= 8250_pci.o

obj-$(CONFIG_SERIAL_8250_HP300)		+= 8250_hp300.o