brcmsmac: remove pcicore_fixcfg()

This is now done in bcma by bcma_core_pci_fixcfg().

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 8df7cb5379c1692e33c3babc0ed8bc3544d768ef..8908c890d64b1e2fca9789044c7161568ac96796 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -484,8 +484,6 @@ ai_buscore_setup(struct si_info *sii, struct bcma_device *cc)
                if (sii->pch == NULL)
                        return false;
        }
-       if (ai_pci_fixcfg(&sii->pub))
-               return false;
 
        return true;
 }
@@ -815,20 +813,6 @@ void ai_pci_down(struct si_pub *sih)
                bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
 }
 
-/*
- * Fixup SROMless PCI device's configuration.
- * The current core may be changed upon return.
- */
-int ai_pci_fixcfg(struct si_pub *sih)
-{
-       struct si_info *sii = (struct si_info *)sih;
-
-       /* Fixup PI in SROM shadow area to enable the correct PCI core access */
-       /* check 'pi' is correct and fix it if not */
-       pcicore_fixcfg(sii->pch);
-       return 0;
-}
-
 /* Enable BT-COEX & Ex-PA for 4313 */
 void ai_epa_4313war(struct si_pub *sih)
 {

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index 14ae9f58a90d0bbe72e30ef59ca68d599fdba1c0..da758c3ff89fce4feb4de67010f94df66914677f 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -199,7 +199,6 @@ extern bool ai_deviceremoved(struct si_pub *sih);
 
 extern void ai_pci_down(struct si_pub *sih);
 extern void ai_pci_up(struct si_pub *sih);
-extern int ai_pci_fixcfg(struct si_pub *sih);
 
 /* Enable Ex-PA for 4313 */
 extern void ai_epa_4313war(struct si_pub *sih);

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 71d7f394c8a2ebe0cec246be1ceca7c89734c658..479cb17c5ba1ff9c057fbf925fb7b5d6641672b4 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -5021,8 +5021,6 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
        ai_clkctl_init(wlc_hw->sih);
        brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
 
-       ai_pci_fixcfg(wlc_hw->sih);
-
        /*
         * TODO: test suspend/resume
         *

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
index 9a3e03bc1fd033fb6e9cdb60c14f7ee63e792813..cd3899b741421fe042374bb15e0777f6b40a9e8d 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
@@ -239,20 +239,3 @@ void pcicore_deinit(struct pcicore_info *pch)
 {
        kfree(pch);
 }
-
-void pcicore_fixcfg(struct pcicore_info *pi)
-{
-       struct bcma_device *core = pi->core;
-       u16 val16;
-       uint regoff;
-
-       regoff = PCIEREGOFFS(sprom[SRSH_PI_OFFSET]);
-
-       val16 = bcma_read16(pi->core, regoff);
-       if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) !=
-           (u16)core->core_index) {
-               val16 = ((u16)core->core_index << SRSH_PI_SHIFT) |
-                       (val16 & ~SRSH_PI_MASK);
-               bcma_write16(pi->core, regoff, val16);
-       }
-}

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
index 1e15ba988cba897c623f6156652feab02b4c0889..cbd426ec0bcf888f720be1d2173593fb494323ce 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
@@ -66,6 +66,5 @@ extern struct pcicore_info *pcicore_init(struct si_pub *sih,
 extern void pcicore_deinit(struct pcicore_info *pch);
 extern void pcicore_up(struct pcicore_info *pch, int state);
 extern void pcicore_down(struct pcicore_info *pch, int state);
-extern void pcicore_fixcfg(struct pcicore_info *pch);
 
 #endif /* _BRCM_NICPCI_H_ */