aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211/brcmfmac
diff options
context:
space:
mode:
authorMike Rapoport <mike.rapoport@gmail.com>2010-11-17 10:00:00 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-19 17:03:39 -0800
commit26361116d7c94984a5fbdc1b6a11555a9dc33cf0 (patch)
tree63853182e35c3ebda59fcd2136c91e1103efd1f3 /drivers/staging/brcm80211/brcmfmac
parent5dc177da85a813ff73c35f2d9edfb0bc2fe8271c (diff)
staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)register
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 9527e295960..d24b5e7d753 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -285,28 +285,17 @@ extern int sdio_function_init(void);
int bcmsdh_register(bcmsdh_driver_t *driver)
{
- int error = 0;
-
drvinfo = *driver;
-#if defined(BCMPLATFORM_BUS)
-#if defined(BCMLXSDMMC)
SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
- error = sdio_function_init();
-#endif /* defined(BCMLXSDMMC) */
- return error;
-#endif /* defined(BCMPLATFORM_BUS) */
-
- return error;
+ return sdio_function_init();
}
extern void sdio_function_cleanup(void);
void bcmsdh_unregister(void)
{
-#if defined(BCMLXSDMMC)
sdio_function_cleanup();
-#endif /* BCMLXSDMMC */
}
#if defined(OOB_INTR_ONLY)