diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2010-09-14 09:45:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 09:04:07 -0700 |
| commit | ca8c1e5990926406708d99fe1ce2a6f5e12f9033 (patch) | |
| tree | a91f355345095656e72711caa6b0e6144732f30b /drivers/staging/brcm80211/sys/wlc_bmac.c | |
| parent | 90ea22962c5160812c601a115fb7b80c60d49fad (diff) | |
| download | op-kernel-dev-ca8c1e5990926406708d99fe1ce2a6f5e12f9033.zip op-kernel-dev-ca8c1e5990926406708d99fe1ce2a6f5e12f9033.tar.gz | |
staging: brcm80211: fix "ERROR: do not use assignment in if condition"
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_bmac.c')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index a496d6a..8feb03e 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -758,11 +758,13 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, uint16 vendor, uint16 device, if (bustype != SI_BUS) { char *var; - if ((var = getvar(vars, "vendid"))) { + var = getvar(vars, "vendid"); + if (var) { vendor = (uint16) bcm_strtoul(var, NULL, 0); WL_ERROR(("Overriding vendor id = 0x%x\n", vendor)); } - if ((var = getvar(vars, "devid"))) { + var = getvar(vars, "devid"); + if (var) { uint16 devid = (uint16) bcm_strtoul(var, NULL, 0); if (devid != 0xffff) { device = devid; @@ -927,9 +929,9 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, uint16 vendor, uint16 device, xmtfifo_sz[(wlc_hw->corerev - XMTFIFOTBL_STARTREV)]; /* Get a phy for this band */ - if ((wlc_hw->band->pi = - wlc_phy_attach(wlc_hw->phy_sh, (void *)(uintptr) regs, - wlc_hw->band->bandtype, vars)) == NULL) { + wlc_hw->band->pi = wlc_phy_attach(wlc_hw->phy_sh, + (void *)(uintptr) regs, wlc_hw->band->bandtype, vars); + if (wlc_hw->band->pi == NULL) { WL_ERROR(("wl%d: wlc_bmac_attach: wlc_phy_attach failed\n", unit)); err = 17; goto fail; @@ -1013,7 +1015,8 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, uint16 vendor, uint16 device, */ /* init etheraddr state variables */ - if ((macaddr = wlc_get_macaddr(wlc_hw)) == NULL) { + macaddr = wlc_get_macaddr(wlc_hw); + if (macaddr == NULL) { WL_ERROR(("wl%d: wlc_bmac_attach: macaddr not found\n", unit)); err = 21; goto fail; @@ -1142,7 +1145,8 @@ BCMINITFN(wlc_bmac_init) (wlc_hw_info_t *wlc_hw, chanspec_t chanspec, WL_TRACE(("wl%d: wlc_bmac_init\n", wlc_hw->unit)); /* request FAST clock if not on */ - if (!(fastclk = wlc_hw->forcefastclk)) + fastclk = wlc_hw->forcefastclk; + if (!fastclk) wlc_clkctl_clk(wlc_hw, CLK_FAST); /* disable interrupts */ @@ -1840,7 +1844,8 @@ void wlc_bmac_bw_set(wlc_hw_info_t *wlc_hw, uint16 bw) uint32 tmp; /* request FAST clock if not on */ - if (!(fastclk = wlc_hw->forcefastclk)) + fastclk = wlc_hw->forcefastclk; + if (!fastclk) wlc_clkctl_clk(wlc_hw, CLK_FAST); wlc_phy_bw_state_set(wlc_hw->band->pi, bw); @@ -2177,7 +2182,8 @@ static char *BCMINITFN(wlc_get_macaddr) (wlc_hw_info_t *wlc_hw) char *macaddr; /* If macaddr exists, use it (Sromrev4, CIS, ...). */ - if ((macaddr = getvar(wlc_hw->vars, varname)) != NULL) + macaddr = getvar(wlc_hw->vars, varname); + if (macaddr != NULL) return macaddr; if (NBANDS_HW(wlc_hw) > 1) @@ -2185,7 +2191,8 @@ static char *BCMINITFN(wlc_get_macaddr) (wlc_hw_info_t *wlc_hw) else varname = "il0macaddr"; - if ((macaddr = getvar(wlc_hw->vars, varname)) == NULL) { + macaddr = getvar(wlc_hw->vars, varname); + if (macaddr == NULL) { WL_ERROR(("wl%d: wlc_get_macaddr: macaddr getvar(%s) not found\n", wlc_hw->unit, varname)); } @@ -2334,7 +2341,8 @@ void BCMINITFN(wlc_bmac_corereset) (wlc_hw_info_t *wlc_hw, uint32 flags) regs = wlc_hw->regs; /* request FAST clock if not on */ - if (!(fastclk = wlc_hw->forcefastclk)) + fastclk = wlc_hw->forcefastclk; + if (!fastclk) wlc_clkctl_clk(wlc_hw, CLK_FAST); /* reset the dma engines except first time thru */ |
