usb host: fix platform driver hotplug/coldplug

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable USB HCDs,
to allow 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: 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 f4fce61d f34c32f1

+30 -6
+6 -2
drivers/usb/host/isp116x-hcd.c
··· 1684 1685 #endif 1686 1687 static struct platform_driver isp116x_driver = { 1688 .probe = isp116x_probe, 1689 .remove = isp116x_remove, 1690 .suspend = isp116x_suspend, 1691 .resume = isp116x_resume, 1692 .driver = { 1693 - .name = (char *)hcd_name, 1694 - }, 1695 }; 1696 1697 /*-----------------------------------------------------------------*/
··· 1684 1685 #endif 1686 1687 + /* work with hotplug and coldplug */ 1688 + MODULE_ALIAS("platform:isp116x-hcd"); 1689 + 1690 static struct platform_driver isp116x_driver = { 1691 .probe = isp116x_probe, 1692 .remove = isp116x_remove, 1693 .suspend = isp116x_suspend, 1694 .resume = isp116x_resume, 1695 .driver = { 1696 + .name = (char *)hcd_name, 1697 + .owner = THIS_MODULE, 1698 + }, 1699 }; 1700 1701 /*-----------------------------------------------------------------*/
+1 -2
drivers/usb/host/ohci-at91.c
··· 355 #define ohci_hcd_at91_drv_resume NULL 356 #endif 357 358 - MODULE_ALIAS("at91_ohci"); 359 360 static struct platform_driver ohci_hcd_at91_driver = { 361 .probe = ohci_hcd_at91_drv_probe, ··· 368 .owner = THIS_MODULE, 369 }, 370 }; 371 -
··· 355 #define ohci_hcd_at91_drv_resume NULL 356 #endif 357 358 + MODULE_ALIAS("platform:at91_ohci"); 359 360 static struct platform_driver ohci_hcd_at91_driver = { 361 .probe = ohci_hcd_at91_drv_probe, ··· 368 .owner = THIS_MODULE, 369 }, 370 };
+1
drivers/usb/host/ohci-au1xxx.c
··· 345 }, 346 }; 347
··· 345 }, 346 }; 347 348 + MODULE_ALIAS("platform:au1xxx-ohci");
+2
drivers/usb/host/ohci-ep93xx.c
··· 211 #endif 212 .driver = { 213 .name = "ep93xx-ohci", 214 }, 215 }; 216
··· 211 #endif 212 .driver = { 213 .name = "ep93xx-ohci", 214 + .owner = THIS_MODULE, 215 }, 216 }; 217 218 + MODULE_ALIAS("platform:ep93xx-ohci");
+1
drivers/usb/host/ohci-lh7a404.c
··· 251 }, 252 }; 253
··· 251 }, 252 }; 253 254 + MODULE_ALIAS("platform:lh7a404-ohci");
+1
drivers/usb/host/ohci-omap.c
··· 544 }, 545 }; 546
··· 544 }, 545 }; 546 547 + MODULE_ALIAS("platform:ohci");
+4
drivers/usb/host/ohci-pnx4008.c
··· 456 return 0; 457 } 458 459 static struct platform_driver usb_hcd_pnx4008_driver = { 460 .driver = { 461 .name = "usb-ohci", 462 }, 463 .probe = usb_hcd_pnx4008_probe, 464 .remove = usb_hcd_pnx4008_remove,
··· 456 return 0; 457 } 458 459 + /* work with hotplug and coldplug */ 460 + MODULE_ALIAS("platform:usb-ohci"); 461 + 462 static struct platform_driver usb_hcd_pnx4008_driver = { 463 .driver = { 464 .name = "usb-ohci", 465 + .owner = THIS_MODULE, 466 }, 467 .probe = usb_hcd_pnx4008_probe, 468 .remove = usb_hcd_pnx4008_remove,
+3 -2
drivers/usb/host/ohci-pnx8550.c
··· 230 return 0; 231 } 232 233 - MODULE_ALIAS("pnx8550-ohci"); 234 235 static struct platform_driver ohci_hcd_pnx8550_driver = { 236 .driver = { 237 - .name = "pnx8550-ohci", 238 }, 239 .probe = ohci_hcd_pnx8550_drv_probe, 240 .remove = ohci_hcd_pnx8550_drv_remove,
··· 230 return 0; 231 } 232 233 + MODULE_ALIAS("platform:pnx8550-ohci"); 234 235 static struct platform_driver ohci_hcd_pnx8550_driver = { 236 .driver = { 237 + .name = "pnx8550-ohci", 238 + .owner = THIS_MODULE, 239 }, 240 .probe = ohci_hcd_pnx8550_drv_probe, 241 .remove = ohci_hcd_pnx8550_drv_remove,
+1
drivers/usb/host/ohci-ppc-soc.c
··· 213 }, 214 }; 215
··· 213 }, 214 }; 215 216 + MODULE_ALIAS("platform:ppc-soc-ohci");
+3
drivers/usb/host/ohci-pxa27x.c
··· 364 } 365 #endif 366 367 368 static struct platform_driver ohci_hcd_pxa27x_driver = { 369 .probe = ohci_hcd_pxa27x_drv_probe, ··· 377 #endif 378 .driver = { 379 .name = "pxa27x-ohci", 380 }, 381 }; 382
··· 364 } 365 #endif 366 367 + /* work with hotplug and coldplug */ 368 + MODULE_ALIAS("platform:pxa27x-ohci"); 369 370 static struct platform_driver ohci_hcd_pxa27x_driver = { 371 .probe = ohci_hcd_pxa27x_drv_probe, ··· 375 #endif 376 .driver = { 377 .name = "pxa27x-ohci", 378 + .owner = THIS_MODULE, 379 }, 380 }; 381
+1
drivers/usb/host/ohci-s3c2410.c
··· 501 }, 502 }; 503
··· 501 }, 502 }; 503 504 + MODULE_ALIAS("platform:s3c2410-ohci");
+1
drivers/usb/host/ohci-sh.c
··· 141 }, 142 }; 143
··· 141 }, 142 }; 143 144 + MODULE_ALIAS("platform:sh_ohci");
+1
drivers/usb/host/ohci-sm501.c
··· 262 .name = "sm501-usb", 263 }, 264 };
··· 262 .name = "sm501-usb", 263 }, 264 }; 265 + MODULE_ALIAS("platform:sm501-usb");
+2
drivers/usb/host/r8a66597-hcd.c
··· 44 MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver"); 45 MODULE_LICENSE("GPL"); 46 MODULE_AUTHOR("Yoshihiro Shimoda"); 47 48 #define DRIVER_VERSION "29 May 2007" 49 ··· 2220 .resume = r8a66597_resume, 2221 .driver = { 2222 .name = (char *) hcd_name, 2223 }, 2224 }; 2225
··· 44 MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver"); 45 MODULE_LICENSE("GPL"); 46 MODULE_AUTHOR("Yoshihiro Shimoda"); 47 + MODULE_ALIAS("platform:r8a66597_hcd"); 48 49 #define DRIVER_VERSION "29 May 2007" 50 ··· 2219 .resume = r8a66597_resume, 2220 .driver = { 2221 .name = (char *) hcd_name, 2222 + .owner = THIS_MODULE, 2223 }, 2224 }; 2225
+1
drivers/usb/host/sl811-hcd.c
··· 58 59 MODULE_DESCRIPTION("SL811HS USB Host Controller Driver"); 60 MODULE_LICENSE("GPL"); 61 62 #define DRIVER_VERSION "19 May 2005" 63
··· 58 59 MODULE_DESCRIPTION("SL811HS USB Host Controller Driver"); 60 MODULE_LICENSE("GPL"); 61 + MODULE_ALIAS("platform:sl811-hcd"); 62 63 #define DRIVER_VERSION "19 May 2005" 64
+1
drivers/usb/host/u132-hcd.c
··· 3316 3317 module_exit(u132_hcd_exit); 3318 MODULE_LICENSE("GPL");
··· 3316 3317 module_exit(u132_hcd_exit); 3318 MODULE_LICENSE("GPL"); 3319 + MODULE_ALIAS("platform:u132_hcd");