summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmsmac/phy
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-11-10 20:30:17 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 20:28:28 +0100
commitbfd8284b6523203e5218864d74b82571df80534f (patch)
tree7770a5d8a3f42a74323479a8b5f62445e98b71f8 /drivers/net/wireless/brcm80211/brcmsmac/phy
parentbrcm80211: smac: fix endianess issue for OTP memory access (diff)
downloadlinux-bfd8284b6523203e5218864d74b82571df80534f.tar.xz
linux-bfd8284b6523203e5218864d74b82571df80534f.zip
brcm80211: smac: remove code under unused macro definitions
There were a couple of code segments left that were placed under a macro definition that was not applicable or not used in the brcmsmac driver. These pieces of code have been removed. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/phy')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
index 2faea509f017..e17edf7e6833 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -190,15 +190,7 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr)
data = R_REG(&pi->regs->radioregdata);
} else {
W_REG_FLUSH(&pi->regs->phy4waddr, addr);
-
-#ifdef __ARM_ARCH_4T__
- __asm__(" .align 4 ");
- __asm__(" nop ");
- data = R_REG(&pi->regs->phy4wdatalo);
-#else
data = R_REG(&pi->regs->phy4wdatalo);
-#endif
-
}
pi->phy_wreg = 0;