staging: brcm80211: always enable code for PLATFORM_BUS functionality

Some code is conditionally compiled in upon defintion of PLATFORM_BUS
macro. This patch will have it compiled in unconditionally.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index f76e62aaa0f25f76b4e0c2013c98247bc68889e1..0674a6ab37921ad3fd0deb69c8eae6260a7487b2 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -16,7 +16,6 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y :=                   \
-       -DBCMPLATFORM_BUS       \
        -DBCMSDIO               \
        -DBRCM_FULLMAC          \
        -DBRCMF_FIRSTREAD=64    \

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 5243f335f9556b052dda418b35c3be053b6ded98..5194c590368f296b99e35e384607855806138a7d 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -36,9 +36,6 @@
 extern void brcmf_sdbrcm_isr(void *args);
 #endif                         /* defined(OOB_INTR_ONLY) */
 #if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270)
-#if !defined(BCMPLATFORM_BUS)
-#define BCMPLATFORM_BUS
-#endif                         /* !defined(BCMPLATFORM_BUS) */
 
 #include <linux/platform_device.h>
 #endif                         /* CONFIG_MACH_SANDGATE2G */
@@ -51,11 +48,7 @@ extern void brcmf_sdbrcm_isr(void *args);
  */
 struct bcmsdh_hc {
        struct bcmsdh_hc *next;
-#ifdef BCMPLATFORM_BUS
        struct device *dev;     /* platform device handle */
-#else
-       struct pci_dev *dev;    /* pci device handle */
-#endif                         /* BCMPLATFORM_BUS */
        void *regs;             /* SDIO Host Controller address */
        struct brcmf_sdio *sdh; /* SDIO Host Controller handle */
        void *ch;
@@ -120,7 +113,6 @@ bool brcmf_sdio_chipmatch(u16 vendor, u16 device)
        return false;
 }
 
-#if defined(BCMPLATFORM_BUS)
 /* forward declarations */
 int brcmf_sdio_probe(struct device *dev);
 EXPORT_SYMBOL(brcmf_sdio_probe);
@@ -228,7 +220,6 @@ int brcmf_sdio_remove(struct device *dev)
        kfree(sdhc);
        return 0;
 }
-#endif                         /* BCMPLATFORM_BUS */
 
 extern int brcmf_sdio_function_init(void);