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

Commit f37d193c authored by Kay Sievers's avatar Kay Sievers Committed by Linus Torvalds
Browse files

watchdog: fix platform driver hotplug/coldplug 



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

[dbrownell@users.sourceforge.net: more drivers; registration fixes]
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f4fce61d

drivers/watchdog/at32ap700x_wdt.c

+3 −0
Original line number Diff line number Diff line
@@ -418,6 +418,9 @@ static int at32_wdt_resume(struct platform_device *pdev) 
#define at32_wdt_resume NULL

#endif



/* work with hotplug and coldplug */

MODULE_ALIAS("platform:at32_wdt");



static struct platform_driver at32_wdt_driver = {

	.remove		= __exit_p(at32_wdt_remove),

	.suspend	= at32_wdt_suspend,

drivers/watchdog/at91rm9200_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -286,3 +286,4 @@ MODULE_AUTHOR("Andrew Victor"); 
MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200");

MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

MODULE_ALIAS("platform:at91_wdt");

drivers/watchdog/davinci_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ static int davinci_wdt_remove(struct platform_device *pdev) 
static struct platform_driver platform_wdt_driver = {

	.driver = {

		.name = "watchdog",

		.owner	= THIS_MODULE,

	},

	.probe = davinci_wdt_probe,

	.remove = davinci_wdt_remove,
@@ -277,3 +278,4 @@ MODULE_PARM_DESC(heartbeat, 


MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

MODULE_ALIAS("platform:watchdog");

drivers/watchdog/ks8695_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -306,3 +306,4 @@ MODULE_AUTHOR("Andrew Victor"); 
MODULE_DESCRIPTION("Watchdog driver for KS8695");

MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

MODULE_ALIAS("platform:ks8695_wdt");

drivers/watchdog/mpc83xx_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static struct platform_driver mpc83xx_wdt_driver = { 
	.remove		= __devexit_p(mpc83xx_wdt_remove),

	.driver		= {

		.name	= "mpc83xx_wdt",

		.owner	= THIS_MODULE,

	},

};
@@ -226,3 +227,4 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gala"); 
MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor");

MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

MODULE_ALIAS("platform:mpc83xx_wdt");