spi: fix platform driver hotplug/coldplug

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable SPI
platform drivers, to allow module 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>
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 7e38c3c4 8d1c98b0

+31 -7
+1
drivers/spi/atmel_spi.c
··· 863 MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); 864 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); 865 MODULE_LICENSE("GPL");
··· 863 MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); 864 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); 865 MODULE_LICENSE("GPL"); 866 + MODULE_ALIAS("platform:atmel_spi");
+3
drivers/spi/au1550_spi.c
··· 958 return 0; 959 } 960 961 static struct platform_driver au1550_spi_drv = { 962 .remove = __exit_p(au1550_spi_remove), 963 .driver = {
··· 958 return 0; 959 } 960 961 + /* work with hotplug and coldplug */ 962 + MODULE_ALIAS("platform:au1550-spi"); 963 + 964 static struct platform_driver au1550_spi_drv = { 965 .remove = __exit_p(au1550_spi_remove), 966 .driver = {
+3
drivers/spi/mpc52xx_psc_spi.c
··· 500 return mpc52xx_psc_spi_do_remove(&dev->dev); 501 } 502 503 static struct platform_driver mpc52xx_psc_spi_platform_driver = { 504 .remove = __exit_p(mpc52xx_psc_spi_remove), 505 .driver = {
··· 500 return mpc52xx_psc_spi_do_remove(&dev->dev); 501 } 502 503 + /* work with hotplug and coldplug */ 504 + MODULE_ALIAS("platform:mpc52xx-psc-spi"); 505 + 506 static struct platform_driver mpc52xx_psc_spi_platform_driver = { 507 .remove = __exit_p(mpc52xx_psc_spi_remove), 508 .driver = {
+3
drivers/spi/omap2_mcspi.c
··· 1084 return 0; 1085 } 1086 1087 static struct platform_driver omap2_mcspi_driver = { 1088 .driver = { 1089 .name = "omap2_mcspi",
··· 1084 return 0; 1085 } 1086 1087 + /* work with hotplug and coldplug */ 1088 + MODULE_ALIAS("platform:omap2_mcspi"); 1089 + 1090 static struct platform_driver omap2_mcspi_driver = { 1091 .driver = { 1092 .name = "omap2_mcspi",
+3 -1
drivers/spi/omap_uwire.c
··· 537 return status; 538 } 539 540 static struct platform_driver uwire_driver = { 541 .driver = { 542 .name = "omap_uwire", 543 - .bus = &platform_bus_type, 544 .owner = THIS_MODULE, 545 }, 546 .remove = __exit_p(uwire_remove),
··· 537 return status; 538 } 539 540 + /* work with hotplug and coldplug */ 541 + MODULE_ALIAS("platform:omap_uwire"); 542 + 543 static struct platform_driver uwire_driver = { 544 .driver = { 545 .name = "omap_uwire", 546 .owner = THIS_MODULE, 547 }, 548 .remove = __exit_p(uwire_remove),
+1 -1
drivers/spi/pxa2xx_spi.c
··· 44 MODULE_AUTHOR("Stephen Street"); 45 MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); 46 MODULE_LICENSE("GPL"); 47 48 #define MAX_BUSES 3 49 ··· 1582 static struct platform_driver driver = { 1583 .driver = { 1584 .name = "pxa2xx-spi", 1585 - .bus = &platform_bus_type, 1586 .owner = THIS_MODULE, 1587 }, 1588 .remove = pxa2xx_spi_remove,
··· 44 MODULE_AUTHOR("Stephen Street"); 45 MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); 46 MODULE_LICENSE("GPL"); 47 + MODULE_ALIAS("platform:pxa2xx-spi"); 48 49 #define MAX_BUSES 3 50 ··· 1581 static struct platform_driver driver = { 1582 .driver = { 1583 .name = "pxa2xx-spi", 1584 .owner = THIS_MODULE, 1585 }, 1586 .remove = pxa2xx_spi_remove,
+1 -1
drivers/spi/spi_bfin5xx.c
··· 1396 #define bfin5xx_spi_resume NULL 1397 #endif /* CONFIG_PM */ 1398 1399 - MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */ 1400 static struct platform_driver bfin5xx_spi_driver = { 1401 .driver = { 1402 .name = DRV_NAME,
··· 1396 #define bfin5xx_spi_resume NULL 1397 #endif /* CONFIG_PM */ 1398 1399 + MODULE_ALIAS("platform:bfin-spi"); 1400 static struct platform_driver bfin5xx_spi_driver = { 1401 .driver = { 1402 .name = DRV_NAME,
+3 -1
drivers/spi/spi_imx.c
··· 1722 #define spi_imx_resume NULL 1723 #endif /* CONFIG_PM */ 1724 1725 static struct platform_driver driver = { 1726 .driver = { 1727 .name = "spi_imx", 1728 - .bus = &platform_bus_type, 1729 .owner = THIS_MODULE, 1730 }, 1731 .remove = __exit_p(spi_imx_remove),
··· 1722 #define spi_imx_resume NULL 1723 #endif /* CONFIG_PM */ 1724 1725 + /* work with hotplug and coldplug */ 1726 + MODULE_ALIAS("platform:spi_imx"); 1727 + 1728 static struct platform_driver driver = { 1729 .driver = { 1730 .name = "spi_imx", 1731 .owner = THIS_MODULE, 1732 }, 1733 .remove = __exit_p(spi_imx_remove),
+3 -2
drivers/spi/spi_mpc83xx.c
··· 523 return 0; 524 } 525 526 - MODULE_ALIAS("mpc83xx_spi"); /* for platform bus hotplug */ 527 static struct platform_driver mpc83xx_spi_driver = { 528 .remove = __exit_p(mpc83xx_spi_remove), 529 .driver = { 530 - .name = "mpc83xx_spi", 531 }, 532 }; 533
··· 523 return 0; 524 } 525 526 + MODULE_ALIAS("platform:mpc83xx_spi"); 527 static struct platform_driver mpc83xx_spi_driver = { 528 .remove = __exit_p(mpc83xx_spi_remove), 529 .driver = { 530 + .name = "mpc83xx_spi", 531 + .owner = THIS_MODULE, 532 }, 533 }; 534
+1 -1
drivers/spi/spi_s3c24xx.c
··· 415 #define s3c24xx_spi_resume NULL 416 #endif 417 418 - MODULE_ALIAS("s3c2410_spi"); /* for platform bus hotplug */ 419 static struct platform_driver s3c24xx_spidrv = { 420 .remove = __exit_p(s3c24xx_spi_remove), 421 .suspend = s3c24xx_spi_suspend,
··· 415 #define s3c24xx_spi_resume NULL 416 #endif 417 418 + MODULE_ALIAS("platform:s3c2410-spi"); 419 static struct platform_driver s3c24xx_spidrv = { 420 .remove = __exit_p(s3c24xx_spi_remove), 421 .suspend = s3c24xx_spi_suspend,
+2
drivers/spi/spi_s3c24xx_gpio.c
··· 168 #define s3c2410_spigpio_suspend NULL 169 #define s3c2410_spigpio_resume NULL 170 171 172 static struct platform_driver s3c2410_spigpio_drv = { 173 .probe = s3c2410_spigpio_probe,
··· 168 #define s3c2410_spigpio_suspend NULL 169 #define s3c2410_spigpio_resume NULL 170 171 + /* work with hotplug and coldplug */ 172 + MODULE_ALIAS("platform:spi_s3c24xx_gpio"); 173 174 static struct platform_driver s3c2410_spigpio_drv = { 175 .probe = s3c2410_spigpio_probe,
+1
drivers/spi/spi_sh_sci.c
··· 203 MODULE_DESCRIPTION("SH SCI SPI Driver"); 204 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>"); 205 MODULE_LICENSE("GPL");
··· 203 MODULE_DESCRIPTION("SH SCI SPI Driver"); 204 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>"); 205 MODULE_LICENSE("GPL"); 206 + MODULE_ALIAS("platform:spi_sh_sci");
+3
drivers/spi/spi_txx9.c
··· 450 return 0; 451 } 452 453 static struct platform_driver txx9spi_driver = { 454 .remove = __exit_p(txx9spi_remove), 455 .driver = {
··· 450 return 0; 451 } 452 453 + /* work with hotplug and coldplug */ 454 + MODULE_ALIAS("platform:spi_txx9"); 455 + 456 static struct platform_driver txx9spi_driver = { 457 .remove = __exit_p(txx9spi_remove), 458 .driver = {
+3
drivers/spi/xilinx_spi.c
··· 408 return 0; 409 } 410 411 static struct platform_driver xilinx_spi_driver = { 412 .probe = xilinx_spi_probe, 413 .remove = __devexit_p(xilinx_spi_remove),
··· 408 return 0; 409 } 410 411 + /* work with hotplug and coldplug */ 412 + MODULE_ALIAS("platform:" XILINX_SPI_NAME); 413 + 414 static struct platform_driver xilinx_spi_driver = { 415 .probe = xilinx_spi_probe, 416 .remove = __devexit_p(xilinx_spi_remove),