evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: brcm80211: align common dirver code

Browse source 
Remove differences in util sources for the two supported drivers.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2011-01-25 16:53:40 +01:00 • committed by Greg Kroah-Hartman
parent 2ea0f6fa65
commit db3f94c5a4
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/brcm80211/util/aiutils.c
View file

@ -131,10 +131,8 @@ void ai_scan(si_t *sih, void *regs, uint devid)
eromptr = regs; eromptr = regs;
break; break;
#ifdef BCMSDIO
case SPI_BUS: case SPI_BUS:
case SDIO_BUS: case SDIO_BUS:
#endif /* BCMSDIO */
eromptr = (u32 *)(unsigned long)erombase; eromptr = (u32 *)(unsigned long)erombase;
break; break;
@ -355,10 +353,8 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap); pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap);
break; break;
#ifdef BCMSDIO
case SPI_BUS: case SPI_BUS:
case SDIO_BUS: case SDIO_BUS:
#endif /* BCMSDIO */
sii->curmap = regs = (void *)(unsigned long)addr; sii->curmap = regs = (void *)(unsigned long)addr;
sii->curwrap = (void *)(unsigned long)wrap; sii->curwrap = (void *)(unsigned long)wrap;
break; break;

11
drivers/staging/brcm80211/util/hndpmu.c
View file

@ -32,6 +32,10 @@
#ifdef BCMDBG #ifdef BCMDBG
#define PMU_MSG(args) printf args #define PMU_MSG(args) printf args
/* debug-only definitions */
/* #define BCMDBG_FORCEHT */
/* #define CHIPC_UART_ALWAYS_ON */
#else #else
#define PMU_MSG(args) #define PMU_MSG(args)
#endif /* BCMDBG */ #endif /* BCMDBG */
@ -2504,12 +2508,7 @@ bool si_pmu_is_otp_powered(si_t *sih, struct osl_info *osh)
return st; return st;
} }
void void si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
#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
{ {
chipcregs_t *cc; chipcregs_t *cc;
uint origidx; uint origidx;