Skip to content

Commit

Permalink
staging: brcm80211: remove redundant CHIPREV macro
Browse files Browse the repository at this point in the history 
The CHIPREV macro simply expands to the macro argument so it is
redundant and as such removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Dec 2, 2010
1 parent dfa2643 commit ff29ee8
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion drivers/staging/brcm80211/include/bcmdefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/sys/wlc_bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/sys/wlc_mac80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/util/aiutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/brcm80211/util/hndpmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/brcm80211/util/siutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
((sih->chip == BCM43236_CHIP_ID
|| sih->chip == BCM43235_CHIP_ID
|| sih->chip == BCM43238_CHIP_ID)
&& (CHIPREV(sii->pub.chiprev) <= 2))) {
&& (sii->pub.chiprev <= 2))) {

if ((cc->chipstatus & CST43236_BP_CLK) != 0) {
uint clkdiv;
Expand Down Expand Up @@ -653,7 +653,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
if ((sih->chip == BCM43224_CHIP_ID) ||
(sih->chip == BCM43421_CHIP_ID)) {
/* enable 12 mA drive strenth for 43224 and set chipControl register bit 15 */
if (CHIPREV(sih->chiprev) == 0) {
if (sih->chiprev == 0) {
SI_MSG(("Applying 43224A0 WARs\n"));
si_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, chipcontrol),
Expand All @@ -662,7 +662,7 @@ static si_info_t *si_doattach(si_info_t *sii, uint devid, struct osl_info *osh,
si_pmu_chipcontrol(sih, 0, CCTRL_43224A0_12MA_LED_DRIVE,
CCTRL_43224A0_12MA_LED_DRIVE);
}
if (CHIPREV(sih->chiprev) >= 1) {
if (sih->chiprev >= 1) {
SI_MSG(("Applying 43224B0+ WARs\n"));
si_pmu_chipcontrol(sih, 0, CCTRL_43224B0_12MA_LED_DRIVE,
CCTRL_43224B0_12MA_LED_DRIVE);
Expand Down Expand Up @@ -1043,7 +1043,7 @@ void si_watchdog(si_t *sih, uint ticks)
if (PMUCTL_ENAB(sih)) {

if ((sih->chip == BCM4319_CHIP_ID) &&
(CHIPREV(sih->chiprev) == 0) && (ticks != 0)) {
(sih->chiprev == 0) && (ticks != 0)) {
si_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, clk_ctl_st), ~0, 0x2);
si_setcore(sih, USB20D_CORE_ID, 0);
Expand Down

0 comments on commit ff29ee8

Please sign in to comment.