aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-12-12 18:15:11 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-13 15:48:32 -0500
commite922602edad30d1f225c32c1cddd80fb3740a8d3 (patch)
tree11ebbc1055d3703d544222346ecedc225167c18f /drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
parent99559f136559e6822f20fcf1b63e6910df126941 (diff)
brcm80211: smac: cleanup buscore handling in aiutils.c
Instead of storing the buscore information now the BCMA core device is kept for quick reference in si_info structure. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/nicpci.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/nicpci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
index a4330416b43..7fad6dc1925 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
@@ -408,7 +408,7 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
408 bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol), 408 bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol),
409 MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL); 409 MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
410 410
411 if (pi->sih->buscorerev >= 10) { 411 if (ai_get_buscorerev(pi->sih) >= 10) {
412 /* new serdes is slower in rw, 412 /* new serdes is slower in rw,
413 * using two layers of reg address mapping 413 * using two layers of reg address mapping
414 */ 414 */
@@ -782,7 +782,6 @@ void pcicore_down(struct pcicore_info *pi, int state)
782 pcie_extendL1timer(pi, false); 782 pcie_extendL1timer(pi, false);
783} 783}
784 784
785/* precondition: current core is sii->buscoretype */
786void pcicore_fixcfg(struct pcicore_info *pi) 785void pcicore_fixcfg(struct pcicore_info *pi)
787{ 786{
788 struct bcma_device *core = pi->core; 787 struct bcma_device *core = pi->core;