diff options
| author | Roland Vossen | 2011-09-02 16:00:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-07 01:46:27 +0200 |
| commit | 0d62b4db565084d33fb9ca3ae8d3814e4dd1a797 (patch) | |
| tree | 8b5d53f767da6ac32c57b74ba482c44ca50c532f /drivers/staging/brcm80211/brcmsmac/phy | |
| parent | staging: brcm80211: remove 'default n' from Kconfig (diff) | |
| download | kernel-qcow2-linux-0d62b4db565084d33fb9ca3ae8d3814e4dd1a797.tar.gz kernel-qcow2-linux-0d62b4db565084d33fb9ca3ae8d3814e4dd1a797.tar.xz kernel-qcow2-linux-0d62b4db565084d33fb9ca3ae8d3814e4dd1a797.zip | |
staging: brcm80211: cleaned up softmac phy macro's affecting code flow
Substituted macro's.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index b52b30589c1a..5f30de20f6da 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -204,7 +204,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) switch (pi->pubpi.phy_type) { case PHY_TYPE_N: - CASECHECK(PHYTYPE, PHY_TYPE_N); + if (!CONF_HAS(PHYTYPE, PHY_TYPE_N)) + break; if (NREV_GE(pi->pubpi.phy_rev, 7)) addr |= RADIO_2057_READ_OFF; else @@ -212,7 +213,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) break; case PHY_TYPE_LCN: - CASECHECK(PHYTYPE, PHY_TYPE_LCN); + if (!CONF_HAS(PHYTYPE, PHY_TYPE_LCN)) + break; addr |= RADIO_2064_READ_OFF; break; |