brcmsmac: remove PCI_FORCEHT() macro

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / brcm80211 / brcmsmac / aiutils.c

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 6d8b7213643aa320dbb05edc026a4510620ef747..c7ec9b7a384b009b8621ca8101628da04b4b8c24 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -318,10 +318,6 @@
 #define        IS_SIM(chippkg) \
        ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
 
-#define PCIE(sih)      (ai_get_buscoretype(sih) == PCIE_CORE_ID)
-
-#define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
-
 #ifdef DEBUG
 #define        SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
 #else
@@ -631,9 +627,8 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
        cc = sii->icbus->drv_cc.core;
 
        /* mask and set */
-       if (mask || val) {
+       if (mask || val)
                bcma_maskset32(cc, regoff, ~mask, val);
-       }
 
        /* readback */
        w = bcma_read32(cc, regoff);
@@ -755,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;
@@ -766,16 +758,10 @@ 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 (PCIE(sih))
+       if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
                bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
 }
 
@@ -783,17 +769,10 @@ 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 (PCIE(sih))
+       if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
                bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
 }