brcmsmac: remove pcicore_hwup()

This is now done by bcma_core_pci_config_fixup() in drivers/bcma/driver_pci.c

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 daa7f252a4ad1e2bb523e8c7e5e037d27ef79a38..fd99e7bd0dc6031de3e02af43fb44a89c4b5b1d0 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -876,7 +876,6 @@ int ai_pci_fixcfg(struct si_pub *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);
-       pcicore_hwup(sii->pch);
        return 0;
 }
 

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
index e57a5b1240f69116834b9a519c5e2905b1299427..c217f8d3a32b9177e7606643ab16cad731852f67 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
@@ -500,28 +500,6 @@ static void pcie_war_serdes(struct pcicore_info *pi)
        }
 }
 
-/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */
-/* Needs to happen when coming out of 'standby'/'hibernate' */
-static void pcie_misc_config_fixup(struct pcicore_info *pi)
-{
-       u16 val16;
-
-       val16 = bcma_read16(pi->core,
-                           PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]));
-
-       if ((val16 & SRSH_L23READY_EXIT_NOPERST) == 0) {
-               val16 |= SRSH_L23READY_EXIT_NOPERST;
-               bcma_write16(pi->core,
-                            PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]), val16);
-       }
-}
-
-/* Needs to happen when coming out of 'standby'/'hibernate' */
-static void pcie_war_pci_setup(struct pcicore_info *pi)
-{
-       pcie_misc_config_fixup(pi);
-}
-
 /* ***** Functions called during driver state changes ***** */
 void pcicore_attach(struct pcicore_info *pi, int state)
 {
@@ -531,14 +509,6 @@ void pcicore_attach(struct pcicore_info *pi, int state)
        pcie_war_serdes(pi);
 }
 
-void pcicore_hwup(struct pcicore_info *pi)
-{
-       if (!pi || ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
-               return;
-
-       pcie_war_pci_setup(pi);
-}
-
 void pcicore_up(struct pcicore_info *pi, int state)
 {
        if (!pi || ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
index 21271b4c20df48fc052e11b7dbf101aaaef68afc..7d7e5e5b4080c04b73cda65ca185ca84c950deef 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
@@ -65,7 +65,6 @@ extern struct pcicore_info *pcicore_init(struct si_pub *sih,
                                         struct bcma_device *core);
 extern void pcicore_deinit(struct pcicore_info *pch);
 extern void pcicore_attach(struct pcicore_info *pch, int state);
-extern void pcicore_hwup(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 u8 pcicore_find_pci_capability(struct pci_dev *dev, u8 req_cap_id,