Skip to content

Commit

Permalink
staging: brcm80211: always enable code for PLATFORM_BUS functionality
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent f3341e7 commit e0d319f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion drivers/staging/brcm80211/brcmfmac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

ccflags-y := \
-DBCMPLATFORM_BUS \
-DBCMSDIO \
-DBRCM_FULLMAC \
-DBRCMF_FIRSTREAD=64 \
Expand Down
9 changes: 0 additions & 9 deletions drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit e0d319f

Please sign in to comment.