package/mac80211/patches/841-brcmsmac-remove-PCI_FORCEHT.patch

   1 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
   2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
   3 @@ -320,8 +320,6 @@
   4  #define        IS_SIM(chippkg) \
   5         ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
   6
   7 -#define PCI_FORCEHT(sih) ((ai_get_buscoretype(sih) == PCIE_CORE_ID) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
   8 -
   9  #ifdef DEBUG
  10  #define        SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
  11  #else
  12 @@ -754,9 +752,6 @@ bool ai_clkctl_cc(struct si_pub *sih, en
  13
  14         sii = (struct si_info *)sih;
  15
  16 -       if (PCI_FORCEHT(sih))
  17 -               return mode == BCMA_CLKMODE_FAST;
  18 -
  19         cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
  20         bcma_core_set_clockmode(cc, mode);
  21         return mode == BCMA_CLKMODE_FAST;
  22 @@ -765,15 +760,9 @@ bool ai_clkctl_cc(struct si_pub *sih, en
  23  void ai_pci_up(struct si_pub *sih)
  24  {
  25         struct si_info *sii;
  26 -       struct bcma_device *cc;
  27
  28         sii = (struct si_info *)sih;
  29
  30 -       if (PCI_FORCEHT(sih)) {
  31 -               cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
  32 -               bcma_core_set_clockmode(cc, BCMA_CLKMODE_FAST);
  33 -       }
  34 -
  35         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
  36                 bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
  37  }
  38 @@ -782,16 +771,9 @@ void ai_pci_up(struct si_pub *sih)
  39  void ai_pci_down(struct si_pub *sih)
  40  {
  41         struct si_info *sii;
  42 -       struct bcma_device *cc;
  43
  44         sii = (struct si_info *)sih;
  45
  46 -       /* release FORCEHT since chip is going to "down" state */
  47 -       if (PCI_FORCEHT(sih)) {
  48 -               cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
  49 -               bcma_core_set_clockmode(cc, BCMA_CLKMODE_DYNAMIC);
  50 -       }
  51 -
  52         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
  53                 bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
  54  }