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

staging: brcm80211: remove redundant CHIPREV macro 



The CHIPREV macro simply expands to the macro argument so it is
redundant and as such removed.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dfa26436

drivers/staging/brcm80211/include/bcmdefs.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#define SPI_BUS			6	/* gSPI target */

#define RPC_BUS			7	/* RPC target */



#define CHIPREV(rev)	(rev)



/* Defines for DMA Address Width - Shared between OSL and HNDDMA */

#define DMADDR_MASK_32 0x0	/* Address mask for 32-bits */

drivers/staging/brcm80211/sys/wlc_bmac.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ bool BCMFASTPATH wlc_dpc(wlc_info_t *wlc, bool bounded) 


		printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",

					__func__, wlc_hw->sih->chip,

					CHIPREV(wlc_hw->sih->chiprev));

					wlc_hw->sih->chiprev);



		WLCNTINCR(wlc->pub->_cnt->psmwds);

drivers/staging/brcm80211/sys/wlc_mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -6428,7 +6428,7 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus) 


		printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",

					__func__, wlc->pub->sih->chip,

					CHIPREV(wlc->pub->sih->chiprev));

					wlc->pub->sih->chiprev);



		WLCNTINCR(wlc->pub->_cnt->psmwds);

drivers/staging/brcm80211/util/aiutils.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <bcmdevs.h>



#define BCM47162_DMP() ((sih->chip == BCM47162_CHIP_ID) && \

		(CHIPREV(sih->chiprev) == 0) && \

		(sih->chiprev == 0) && \

		(sii->coreid[sii->curidx] == MIPS74K_CORE_ID))



/* EROM parsing */

drivers/staging/brcm80211/util/hndpmu.c

+4 −4
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static void si_pmu1_pllinit0(si_t *sih, struct osl_info *osh, chipcregs_t *cc, 
		si_pmu_set_4330_plldivs(sih);



	if ((sih->chip == BCM4329_CHIP_ID)

	    && (CHIPREV(sih->chiprev) == 0)) {

	    && (sih->chiprev == 0)) {



		W_REG(osh, &cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);

		tmp = R_REG(osh, &cc->pllcontrol_data);
@@ -1443,7 +1443,7 @@ static void si_pmu1_pllinit0(si_t *sih, struct osl_info *osh, chipcregs_t *cc, 
	    ((xt->xf << PCTL_XTALFREQ_SHIFT) & PCTL_XTALFREQ_MASK);



	if ((sih->chip == BCM4329_CHIP_ID)

	    && CHIPREV(sih->chiprev) == 0) {

	    && sih->chiprev == 0) {

		/* clear the htstretch before clearing HTReqEn */

		AND_REG(osh, &cc->clkstretch, ~CSTRETCH_HT);

		tmp &= ~PCTL_HT_REQ_EN;
@@ -1708,7 +1708,7 @@ u32 si_pmu_si_clock(si_t *sih, struct osl_info *osh) 
				  PMU5_MAINPLL_SI);

		break;

	case BCM4329_CHIP_ID:

		if (CHIPREV(sih->chiprev) == 0)

		if (sih->chiprev == 0)

			clock = 38400 * 1000;

		else

			clock = si_pmu1_cpuclk0(sih, osh, cc);
@@ -2562,7 +2562,7 @@ void si_pmu_swreg_init(si_t *sih, struct osl_info *osh) 
				       0xe);

		/* Reduce LNLDO1 output voltage to 1.2V */

		si_pmu_set_ldo_voltage(sih, osh, SET_LDO_VOLTAGE_LNLDO1, 0xe);

		if (CHIPREV(sih->chiprev) == 0)

		if (sih->chiprev == 0)

			si_pmu_regcontrol(sih, 2, 0x400000, 0x400000);

		break;