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

Commit e169c139 authored Apr 15, 2008 by Kay Sievers Committed by Linus Torvalds Apr 15, 2008

serial: fix platform driver hotplug/coldplug



Since 43cc71ee, the platform modalias is
prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable serial
platform drivers, to re-enable auto loading.

NOTE that Kconfig for some of these drivers doesn't allow modular builds, and
thus doesn't match the driver source's unload support.  Presumably their
unload code is buggy and/or weakly tested...

[dbrownell@users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 12c2c019

drivers/serial/atmel_serial.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1577,3 +1577,4 @@ module_exit(atmel_serial_exit);
	MODULE_AUTHOR("Rick Bronson");		MODULE_AUTHOR("Rick Bronson");
	MODULE_DESCRIPTION("Atmel AT91 / AT32 serial port driver");		MODULE_DESCRIPTION("Atmel AT91 / AT32 serial port driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
			MODULE_ALIAS("platform:atmel_usart");

drivers/serial/bfin_5xx.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1243,6 +1243,7 @@ static struct platform_driver bfin_serial_driver = {
	.resume = bfin_serial_resume,		.resume = bfin_serial_resume,
	.driver = {		.driver = {
	.name = "bfin-uart",		.name = "bfin-uart",
			.owner = THIS_MODULE,
	},		},
	};		};

	@@ -1301,3 +1302,4 @@ MODULE_AUTHOR("Aubrey.Li <aubrey.li@analog.com>");
	MODULE_DESCRIPTION("Blackfin generic serial port driver");		MODULE_DESCRIPTION("Blackfin generic serial port driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
	MODULE_ALIAS_CHARDEV_MAJOR(BFIN_SERIAL_MAJOR);		MODULE_ALIAS_CHARDEV_MAJOR(BFIN_SERIAL_MAJOR);
			MODULE_ALIAS("platform:bfin-uart");

drivers/serial/imx.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1090,6 +1090,7 @@ static struct platform_driver serial_imx_driver = {
	.resume = serial_imx_resume,		.resume = serial_imx_resume,
	.driver = {		.driver = {
	.name = "imx-uart",		.name = "imx-uart",
			.owner = THIS_MODULE,
	},		},
	};		};

	@@ -1124,3 +1125,4 @@ module_exit(imx_serial_exit);
	MODULE_AUTHOR("Sascha Hauer");		MODULE_AUTHOR("Sascha Hauer");
	MODULE_DESCRIPTION("IMX generic serial port driver");		MODULE_DESCRIPTION("IMX generic serial port driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
			MODULE_ALIAS("platform:imx-uart");

drivers/serial/mcf.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -649,5 +649,6 @@ module_exit(mcf_exit);
	MODULE_AUTHOR("Greg Ungerer <gerg@snapgear.com>");		MODULE_AUTHOR("Greg Ungerer <gerg@snapgear.com>");
	MODULE_DESCRIPTION("Freescale ColdFire UART driver");		MODULE_DESCRIPTION("Freescale ColdFire UART driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
			MODULE_ALIAS("platform:mcfuart");

	/****************************************************************************/		/****************************************************************************/

drivers/serial/mpc52xx_uart.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1188,6 +1188,8 @@ mpc52xx_uart_resume(struct platform_device *dev)
	}		}
	#endif		#endif

			/* work with hotplug and coldplug */
			MODULE_ALIAS("platform:mpc52xx-psc");

	static struct platform_driver mpc52xx_uart_platform_driver = {		static struct platform_driver mpc52xx_uart_platform_driver = {
	.probe = mpc52xx_uart_probe,		.probe = mpc52xx_uart_probe,