From db3f94c5a44ebe356c3850bf2c04ea0bd5d2443e Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Tue, 25 Jan 2011 16:53:40 +0100 Subject: [PATCH] staging: brcm80211: align common dirver code Remove differences in util sources for the two supported drivers. Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/util/aiutils.c | 4 ---- drivers/staging/brcm80211/util/hndpmu.c | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c index b6e7a9e97379..e4842c12ccf7 100644 --- a/drivers/staging/brcm80211/util/aiutils.c +++ b/drivers/staging/brcm80211/util/aiutils.c @@ -131,10 +131,8 @@ void ai_scan(si_t *sih, void *regs, uint devid) eromptr = regs; break; -#ifdef BCMSDIO case SPI_BUS: case SDIO_BUS: -#endif /* BCMSDIO */ eromptr = (u32 *)(unsigned long)erombase; break; @@ -355,10 +353,8 @@ void *ai_setcoreidx(si_t *sih, uint coreidx) pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap); break; -#ifdef BCMSDIO case SPI_BUS: case SDIO_BUS: -#endif /* BCMSDIO */ sii->curmap = regs = (void *)(unsigned long)addr; sii->curwrap = (void *)(unsigned long)wrap; break; diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index 49d19a121f7b..2678d799f7fd 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -32,6 +32,10 @@ #ifdef BCMDBG #define PMU_MSG(args) printf args + +/* debug-only definitions */ +/* #define BCMDBG_FORCEHT */ +/* #define CHIPC_UART_ALWAYS_ON */ #else #define PMU_MSG(args) #endif /* BCMDBG */ @@ -2504,12 +2508,7 @@ bool si_pmu_is_otp_powered(si_t *sih, struct osl_info *osh) return st; } -void -#if defined(BCMDBG) -si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable) -#else -si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable) -#endif +void si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable) { chipcregs_t *cc; uint origidx; -- 2.20.1