tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

watchdog: fix platform driver hotplug/coldplug

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, 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: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Kay Sievers and committed by Linus Torvalds f37d193c f4fce61d

+20
unified split
+3
drivers/watchdog/at32ap700x_wdt.c
··· 418 #define at32_wdt_resume NULL 419 #endif 420 421 static struct platform_driver at32_wdt_driver = { 422 .remove = __exit_p(at32_wdt_remove), 423 .suspend = at32_wdt_suspend,
··· 418 #define at32_wdt_resume NULL 419 #endif 420 421 + /* work with hotplug and coldplug */ 422 + MODULE_ALIAS("platform:at32_wdt"); 423 + 424 static struct platform_driver at32_wdt_driver = { 425 .remove = __exit_p(at32_wdt_remove), 426 .suspend = at32_wdt_suspend,
+1
drivers/watchdog/at91rm9200_wdt.c
··· 286 MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); 287 MODULE_LICENSE("GPL"); 288 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 286 MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200"); 287 MODULE_LICENSE("GPL"); 288 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 289 + MODULE_ALIAS("platform:at91_wdt");
+2
drivers/watchdog/davinci_wdt.c
··· 248 static struct platform_driver platform_wdt_driver = { 249 .driver = { 250 .name = "watchdog", 251 }, 252 .probe = davinci_wdt_probe, 253 .remove = davinci_wdt_remove, ··· 278 279 MODULE_LICENSE("GPL"); 280 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 248 static struct platform_driver platform_wdt_driver = { 249 .driver = { 250 .name = "watchdog", 251 + .owner = THIS_MODULE, 252 }, 253 .probe = davinci_wdt_probe, 254 .remove = davinci_wdt_remove, ··· 277 278 MODULE_LICENSE("GPL"); 279 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 280 + MODULE_ALIAS("platform:watchdog");
+1
drivers/watchdog/ks8695_wdt.c
··· 306 MODULE_DESCRIPTION("Watchdog driver for KS8695"); 307 MODULE_LICENSE("GPL"); 308 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 306 MODULE_DESCRIPTION("Watchdog driver for KS8695"); 307 MODULE_LICENSE("GPL"); 308 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 309 + MODULE_ALIAS("platform:ks8695_wdt");
+2
drivers/watchdog/mpc83xx_wdt.c
··· 206 .remove = __devexit_p(mpc83xx_wdt_remove), 207 .driver = { 208 .name = "mpc83xx_wdt", 209 }, 210 }; 211 ··· 227 MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor"); 228 MODULE_LICENSE("GPL"); 229 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 206 .remove = __devexit_p(mpc83xx_wdt_remove), 207 .driver = { 208 .name = "mpc83xx_wdt", 209 + .owner = THIS_MODULE, 210 }, 211 }; 212 ··· 226 MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor"); 227 MODULE_LICENSE("GPL"); 228 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 229 + MODULE_ALIAS("platform:mpc83xx_wdt");
+3
drivers/watchdog/mpcore_wdt.c
··· 392 return 0; 393 } 394 395 static struct platform_driver mpcore_wdt_driver = { 396 .probe = mpcore_wdt_probe, 397 .remove = __devexit_p(mpcore_wdt_remove),
··· 392 return 0; 393 } 394 395 + /* work with hotplug and coldplug */ 396 + MODULE_ALIAS("platform:mpcore_wdt"); 397 + 398 static struct platform_driver mpcore_wdt_driver = { 399 .probe = mpcore_wdt_probe, 400 .remove = __devexit_p(mpcore_wdt_remove),
+2
drivers/watchdog/mtx-1_wdt.c
··· 243 .probe = mtx1_wdt_probe, 244 .remove = mtx1_wdt_remove, 245 .driver.name = "mtx1-wdt", 246 }; 247 248 static int __init mtx1_wdt_init(void) ··· 263 MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); 264 MODULE_LICENSE("GPL"); 265 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 243 .probe = mtx1_wdt_probe, 244 .remove = mtx1_wdt_remove, 245 .driver.name = "mtx1-wdt", 246 + .driver.owner = THIS_MODULE, 247 }; 248 249 static int __init mtx1_wdt_init(void) ··· 262 MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); 263 MODULE_LICENSE("GPL"); 264 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 265 + MODULE_ALIAS("platform:mtx1-wdt");
+1
drivers/watchdog/mv64x60_wdt.c
··· 324 MODULE_DESCRIPTION("MV64x60 watchdog driver"); 325 MODULE_LICENSE("GPL"); 326 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 324 MODULE_DESCRIPTION("MV64x60 watchdog driver"); 325 MODULE_LICENSE("GPL"); 326 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 327 + MODULE_ALIAS("platform:" MV64x60_WDT_NAME);
+1
drivers/watchdog/omap_wdt.c
··· 387 MODULE_AUTHOR("George G. Davis"); 388 MODULE_LICENSE("GPL"); 389 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 387 MODULE_AUTHOR("George G. Davis"); 388 MODULE_LICENSE("GPL"); 389 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 390 + MODULE_ALIAS("platform:omap_wdt");
+2
drivers/watchdog/pnx4008_wdt.c
··· 321 static struct platform_driver platform_wdt_driver = { 322 .driver = { 323 .name = "watchdog", 324 }, 325 .probe = pnx4008_wdt_probe, 326 .remove = pnx4008_wdt_remove, ··· 355 356 MODULE_LICENSE("GPL"); 357 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 321 static struct platform_driver platform_wdt_driver = { 322 .driver = { 323 .name = "watchdog", 324 + .owner = THIS_MODULE, 325 }, 326 .probe = pnx4008_wdt_probe, 327 .remove = pnx4008_wdt_remove, ··· 354 355 MODULE_LICENSE("GPL"); 356 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 357 + MODULE_ALIAS("platform:watchdog");
+1
drivers/watchdog/s3c2410_wdt.c
··· 561 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); 562 MODULE_LICENSE("GPL"); 563 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 561 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); 562 MODULE_LICENSE("GPL"); 563 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 564 + MODULE_ALIAS("platform:s3c2410-wdt");
+1
drivers/watchdog/txx9wdt.c
··· 274 MODULE_DESCRIPTION("TXx9 Watchdog Driver"); 275 MODULE_LICENSE("GPL"); 276 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
··· 274 MODULE_DESCRIPTION("TXx9 Watchdog Driver"); 275 MODULE_LICENSE("GPL"); 276 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 277 + MODULE_ALIAS("platform:txx9wdt");