lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brcmsmac: remove PCI_FORCEHT() macro

Browse Source 
The BCM4716 is a SoC and does not have a PCI client interface, so this
condition is never true.

Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hauke Mehrtens
2012-06-30 15:16:05 +02:00
committed by John W. Linville
parent a55b316e02
commit 1dfef20a4c
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
View File

@@ -318,9 +318,6 @@
#define IS_SIM(chippkg) \ #define IS_SIM(chippkg) \
((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID)) ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
#define PCI_FORCEHT(sih) ((ai_get_buscoretype(sih) == PCIE_CORE_ID) && \
(ai_get_chip_id(sih) == BCM4716_CHIP_ID))
#ifdef DEBUG #ifdef DEBUG
#define SI_MSG(fmt, ...) pr_debug(fmt, ##__VA_ARGS__) #define SI_MSG(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
#else #else
@@ -753,9 +750,6 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode)
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
if (PCI_FORCEHT(sih))
return mode == BCMA_CLKMODE_FAST;
cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0); cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
bcma_core_set_clockmode(cc, mode); bcma_core_set_clockmode(cc, mode);
return mode == BCMA_CLKMODE_FAST; return mode == BCMA_CLKMODE_FAST;
@@ -764,15 +758,9 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode)
void ai_pci_up(struct si_pub *sih) void ai_pci_up(struct si_pub *sih)
{ {
struct si_info *sii; struct si_info *sii;
struct bcma_device *cc;
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
if (PCI_FORCEHT(sih)) {
cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
bcma_core_set_clockmode(cc, BCMA_CLKMODE_FAST);
}
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true); bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
} }
@@ -781,16 +769,9 @@ void ai_pci_up(struct si_pub *sih)
void ai_pci_down(struct si_pub *sih) void ai_pci_down(struct si_pub *sih)
{ {
struct si_info *sii; struct si_info *sii;
struct bcma_device *cc;
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
/* release FORCEHT since chip is going to "down" state */
if (PCI_FORCEHT(sih)) {
cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
bcma_core_set_clockmode(cc, BCMA_CLKMODE_DYNAMIC);
}
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false); bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
} }