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

mmc: fix platform driver hotplug/coldplug

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

Also, add missing owner declarations in driver init.

[dbrownell@users.sourceforge.net: registration fixes]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
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
bc65c724 bead9a3a

+10 -1
+1
drivers/mmc/host/at91_mci.c
··· 1075 1075 MODULE_DESCRIPTION("AT91 Multimedia Card Interface driver"); 1076 1076 MODULE_AUTHOR("Nick Randell"); 1077 1077 MODULE_LICENSE("GPL"); 1078 + MODULE_ALIAS("platform:at91_mci");
+2
drivers/mmc/host/au1xmmc.c
··· 998 998 .resume = NULL, 999 999 .driver = { 1000 1000 .name = DRIVER_NAME, 1001 + .owner = THIS_MODULE, 1001 1002 }, 1002 1003 }; 1003 1004 ··· 1019 1018 MODULE_AUTHOR("Advanced Micro Devices, Inc"); 1020 1019 MODULE_DESCRIPTION("MMC/SD driver for the Alchemy Au1XXX"); 1021 1020 MODULE_LICENSE("GPL"); 1021 + MODULE_ALIAS("platform:au1xxx-mmc"); 1022 1022 #endif 1023 1023
+2
drivers/mmc/host/imxmmc.c
··· 1128 1128 .resume = imxmci_resume, 1129 1129 .driver = { 1130 1130 .name = DRIVER_NAME, 1131 + .owner = THIS_MODULE, 1131 1132 } 1132 1133 }; 1133 1134 ··· 1148 1147 MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver"); 1149 1148 MODULE_AUTHOR("Sascha Hauer, Pengutronix"); 1150 1149 MODULE_LICENSE("GPL"); 1150 + MODULE_ALIAS("platform:imx-mmc");
+2 -1
drivers/mmc/host/omap.c
··· 1255 1255 .resume = mmc_omap_resume, 1256 1256 .driver = { 1257 1257 .name = DRIVER_NAME, 1258 + .owner = THIS_MODULE, 1258 1259 }, 1259 1260 }; 1260 1261 ··· 1274 1273 1275 1274 MODULE_DESCRIPTION("OMAP Multimedia Card driver"); 1276 1275 MODULE_LICENSE("GPL"); 1277 - MODULE_ALIAS(DRIVER_NAME); 1276 + MODULE_ALIAS("platform:" DRIVER_NAME); 1278 1277 MODULE_AUTHOR("Juha Yrj�l�");
+2
drivers/mmc/host/pxamci.c
··· 693 693 .resume = pxamci_resume, 694 694 .driver = { 695 695 .name = DRIVER_NAME, 696 + .owner = THIS_MODULE, 696 697 }, 697 698 }; 698 699 ··· 712 711 713 712 MODULE_DESCRIPTION("PXA Multimedia Card Interface Driver"); 714 713 MODULE_LICENSE("GPL"); 714 + MODULE_ALIAS("platform:pxa2xx-mci");
+1
drivers/mmc/host/wbsd.c
··· 1948 1948 .resume = wbsd_platform_resume, 1949 1949 .driver = { 1950 1950 .name = DRIVER_NAME, 1951 + .owner = THIS_MODULE, 1951 1952 }, 1952 1953 }; 1953 1954