diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-29 02:50:31 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:45:24 -0400 |
| commit | 63286295e6e069649b3234c3080d9c141524daea (patch) | |
| tree | 14a5ebc26ede4c5d04f92eb21c56caf6aae29656 | |
| parent | 23c8ae8d8cacc052215da374c414bad2c36c91e4 (diff) | |
| download | op-kernel-dev-63286295e6e069649b3234c3080d9c141524daea.zip op-kernel-dev-63286295e6e069649b3234c3080d9c141524daea.tar.gz | |
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>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/nicpci.c | 30 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/nicpci.h | 1 |
3 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c index daa7f25..fd99e7bd 100644 --- 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 e57a5b1..c217f8d 100644 --- 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 21271b4..7d7e5e5 100644 --- 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, |
