Commit e0d319f5 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman

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: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f3341e71
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
ccflags-y := \ ccflags-y := \
-DBCMPLATFORM_BUS \
-DBCMSDIO \ -DBCMSDIO \
-DBRCM_FULLMAC \ -DBRCM_FULLMAC \
-DBRCMF_FIRSTREAD=64 \ -DBRCMF_FIRSTREAD=64 \
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
extern void brcmf_sdbrcm_isr(void *args); extern void brcmf_sdbrcm_isr(void *args);
#endif /* defined(OOB_INTR_ONLY) */ #endif /* defined(OOB_INTR_ONLY) */
#if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270) #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> #include <linux/platform_device.h>
#endif /* CONFIG_MACH_SANDGATE2G */ #endif /* CONFIG_MACH_SANDGATE2G */
...@@ -51,11 +48,7 @@ extern void brcmf_sdbrcm_isr(void *args); ...@@ -51,11 +48,7 @@ extern void brcmf_sdbrcm_isr(void *args);
*/ */
struct bcmsdh_hc { struct bcmsdh_hc {
struct bcmsdh_hc *next; struct bcmsdh_hc *next;
#ifdef BCMPLATFORM_BUS
struct device *dev; /* platform device handle */ struct device *dev; /* platform device handle */
#else
struct pci_dev *dev; /* pci device handle */
#endif /* BCMPLATFORM_BUS */
void *regs; /* SDIO Host Controller address */ void *regs; /* SDIO Host Controller address */
struct brcmf_sdio *sdh; /* SDIO Host Controller handle */ struct brcmf_sdio *sdh; /* SDIO Host Controller handle */
void *ch; void *ch;
...@@ -120,7 +113,6 @@ bool brcmf_sdio_chipmatch(u16 vendor, u16 device) ...@@ -120,7 +113,6 @@ bool brcmf_sdio_chipmatch(u16 vendor, u16 device)
return false; return false;
} }
#if defined(BCMPLATFORM_BUS)
/* forward declarations */ /* forward declarations */
int brcmf_sdio_probe(struct device *dev); int brcmf_sdio_probe(struct device *dev);
EXPORT_SYMBOL(brcmf_sdio_probe); EXPORT_SYMBOL(brcmf_sdio_probe);
...@@ -228,7 +220,6 @@ int brcmf_sdio_remove(struct device *dev) ...@@ -228,7 +220,6 @@ int brcmf_sdio_remove(struct device *dev)
kfree(sdhc); kfree(sdhc);
return 0; return 0;
} }
#endif /* BCMPLATFORM_BUS */
extern int brcmf_sdio_function_init(void); extern int brcmf_sdio_function_init(void);
......
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