Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dfef20a authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: remove PCI_FORCEHT() macro 



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

Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a55b316e

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+0 −19
Original line number Diff line number Diff line
@@ -318,9 +318,6 @@ 
#define	IS_SIM(chippkg)	\

	((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

#define	SI_MSG(fmt, ...)	pr_debug(fmt, ##__VA_ARGS__)

#else
@@ -753,9 +750,6 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode) 


	sii = (struct si_info *)sih;



	if (PCI_FORCEHT(sih))

		return mode == BCMA_CLKMODE_FAST;



	cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);

	bcma_core_set_clockmode(cc, mode);

	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)

{

	struct si_info *sii;

	struct bcma_device *cc;



	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)

		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)

{

	struct si_info *sii;

	struct bcma_device *cc;



	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)

		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);

}