brcmsmac: remove ai_chipcontrl_epa4331

ai_chipcontrl_epa4331 is not referenced by any method in brcmsmac and
the functionality is already in bcma_chipco_bcm4331_ext_pa_lines_ctl in
drivers/bcma/driver_chipcommon_pmu.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>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 585a5169ca5048539361bc0664a3f9d482b9ab8f..ade9d1b342cfa6d381eab2c0bce01c62817e6fbb 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -865,30 +865,6 @@ u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, u8 priority)
        return ai_cc_reg(sih, regoff, mask, val);
 }
 
-void ai_chipcontrl_epa4331(struct si_pub *sih, bool on)
-{
-       struct bcma_device *cc;
-       u32 val;
-
-       cc = ai_findcore(sih, CC_CORE_ID, 0);
-
-       if (on) {
-               if (ai_get_chippkg(sih) == 9 || ai_get_chippkg(sih) == 0xb)
-                       /* Ext PA Controls for 4331 12x9 Package */
-                       bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
-                                  CCTRL4331_EXTPA_EN |
-                                  CCTRL4331_EXTPA_ON_GPIO2_5);
-               else
-                       /* Ext PA Controls for 4331 12x12 Package */
-                       bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
-                                  CCTRL4331_EXTPA_EN);
-       } else {
-               val &= ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5);
-               bcma_mask32(cc, CHIPCREGOFFS(chipcontrol),
-                           ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5));
-       }
-}
-
 /* Enable BT-COEX & Ex-PA for 4313 */
 void ai_epa_4313war(struct si_pub *sih)
 {

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index 39942572013bdf3a815ecc0b5bd4ea87eb6cba8d..7c6108a2f44dff9363063cd4901d7cbb91b371b7 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -207,7 +207,6 @@ extern void ai_pci_down(struct si_pub *sih);
 extern void ai_pci_up(struct si_pub *sih);
 extern int ai_pci_fixcfg(struct si_pub *sih);
 
-extern void ai_chipcontrl_epa4331(struct si_pub *sih, bool on);
 /* Enable Ex-PA for 4313 */
 extern void ai_epa_4313war(struct si_pub *sih);