Commit ae0d9eba authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman

staging: brcm80211: brcmfmac: remove PXA SDIO controller binding

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5b93a8b8
...@@ -137,17 +137,6 @@ static int __devinit bcmsdh_probe(struct device *dev); ...@@ -137,17 +137,6 @@ static int __devinit bcmsdh_probe(struct device *dev);
static int __devexit bcmsdh_remove(struct device *dev); static int __devexit bcmsdh_remove(struct device *dev);
#endif /* BCMLXSDMMC */ #endif /* BCMLXSDMMC */
#ifndef BCMLXSDMMC
static struct device_driver bcmsdh_driver = {
.name = "pxa2xx-mci",
.bus = &platform_bus_type,
.probe = bcmsdh_probe,
.remove = bcmsdh_remove,
.suspend = NULL,
.resume = NULL,
};
#endif /* BCMLXSDMMC */
#ifndef BCMLXSDMMC #ifndef BCMLXSDMMC
static static
#endif /* BCMLXSDMMC */ #endif /* BCMLXSDMMC */
...@@ -522,9 +511,6 @@ int bcmsdh_register(bcmsdh_driver_t *driver) ...@@ -522,9 +511,6 @@ int bcmsdh_register(bcmsdh_driver_t *driver)
#if defined(BCMLXSDMMC) #if defined(BCMLXSDMMC)
SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n")); SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
error = sdio_function_init(); error = sdio_function_init();
#else
SDLX_MSG(("Intel PXA270 SDIO Driver\n"));
error = driver_register(&bcmsdh_driver);
#endif /* defined(BCMLXSDMMC) */ #endif /* defined(BCMLXSDMMC) */
return error; return error;
#endif /* defined(BCMPLATFORM_BUS) */ #endif /* defined(BCMPLATFORM_BUS) */
...@@ -544,9 +530,6 @@ extern void sdio_function_cleanup(void); ...@@ -544,9 +530,6 @@ extern void sdio_function_cleanup(void);
void bcmsdh_unregister(void) void bcmsdh_unregister(void)
{ {
#if defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
driver_unregister(&bcmsdh_driver);
#endif
#if defined(BCMLXSDMMC) #if defined(BCMLXSDMMC)
sdio_function_cleanup(); sdio_function_cleanup();
#endif /* BCMLXSDMMC */ #endif /* BCMLXSDMMC */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment