summaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211/sys/wlc_mac80211.c
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2010-12-02 14:44:51 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-02 20:34:09 (GMT)
commitdfa26436109d06f233a0ad735731cfb2d0c6ab5a (patch)
tree0e87d36ce6a167f45b03204a394e48d3c0febbd8 /drivers/staging/brcm80211/sys/wlc_mac80211.c
parent92246bcbd7730eaaec0c29a2adc1cb4b4451ed9e (diff)
downloadlinux-fsl-qoriq-dfa26436109d06f233a0ad735731cfb2d0c6ab5a.tar.xz
staging: brcm80211: remove redundant CHIPID macro
The CHIPID 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>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_mac80211.c')
-rw-r--r--drivers/staging/brcm80211/sys/wlc_mac80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 7017db6..f64a9e8 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -1991,7 +1991,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
wlc_radio_mpc_upd(wlc);
if (WLANTSEL_ENAB(wlc)) {
- if ((CHIPID(wlc->pub->sih->chip)) == BCM43235_CHIP_ID) {
+ if ((wlc->pub->sih->chip) == BCM43235_CHIP_ID) {
if ((getintvar(wlc->pub->vars, "aa2g") == 7) ||
(getintvar(wlc->pub->vars, "aa5g") == 7)) {
wlc_bmac_antsel_set(wlc->hw, 1);
@@ -2537,7 +2537,7 @@ int wlc_up(wlc_info_t *wlc)
}
if ((wlc->pub->boardflags & BFL_FEM)
- && (CHIPID(wlc->pub->sih->chip) == BCM4313_CHIP_ID)) {
+ && (wlc->pub->sih->chip == BCM4313_CHIP_ID)) {
if (wlc->pub->boardrev >= 0x1250
&& (wlc->pub->boardflags & BFL_FEM_BT)) {
wlc_mhf(wlc, MHF5, MHF5_4313_GPIOCTRL,
@@ -6427,8 +6427,8 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
WL_ERROR(("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n", wlc->pub->unit, wlc->pub->now));
printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
- __func__, CHIPID(wlc->pub->sih->chip),
- CHIPREV(wlc->pub->sih->chiprev));
+ __func__, wlc->pub->sih->chip,
+ CHIPREV(wlc->pub->sih->chiprev));
WLCNTINCR(wlc->pub->_cnt->psmwds);