Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db3f94c5 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: align common dirver code 



Remove differences in util sources for the two supported drivers.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ea0f6fa

drivers/staging/brcm80211/util/aiutils.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/util/hndpmu.c

+5 −6
Original line number Diff line number Diff line
@@ -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;