---

yaml --- r: 306762 b: refs/heads/master c: 6328629 h: refs/heads/master v: v3
git-mirror · May 16, 2012 · ab2cbf4 · ab2cbf4
1 parent f98d7b6
commit ab2cbf4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 33 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c8ae8d8cacc052215da374c414bad2c36c91e4
+refs/heads/master: 63286295e6e069649b3234c3080d9c141524daea
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/trunk/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/trunk/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/trunk/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/trunk/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h b/trunk/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,