staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)register
authorMike Rapoport <mike.rapoport@gmail.com>
Wed, 17 Nov 2010 08:00:00 +0000 (10:00 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 20 Nov 2010 01:03:39 +0000 (17:03 -0800)
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>
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

index 9527e29..d24b5e7 100644 (file)
@@ -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)