diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-28 20:50:33 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 12:45:24 -0400 |
commit | 763997f61d7f57e62dbf76b33c3443213aedd803 (patch) | |
tree | ea9cbddb90b97962c2ddb54336f49e425c975c9f /drivers | |
parent | b30ee754400d16606fc6308fa36ad4f49a72ff85 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 24 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c index 585a5169ca50..ade9d1b342cf 100644 --- 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) | |||
865 | return ai_cc_reg(sih, regoff, mask, val); | 865 | return ai_cc_reg(sih, regoff, mask, val); |
866 | } | 866 | } |
867 | 867 | ||
868 | void ai_chipcontrl_epa4331(struct si_pub *sih, bool on) | ||
869 | { | ||
870 | struct bcma_device *cc; | ||
871 | u32 val; | ||
872 | |||
873 | cc = ai_findcore(sih, CC_CORE_ID, 0); | ||
874 | |||
875 | if (on) { | ||
876 | if (ai_get_chippkg(sih) == 9 || ai_get_chippkg(sih) == 0xb) | ||
877 | /* Ext PA Controls for 4331 12x9 Package */ | ||
878 | bcma_set32(cc, CHIPCREGOFFS(chipcontrol), | ||
879 | CCTRL4331_EXTPA_EN | | ||
880 | CCTRL4331_EXTPA_ON_GPIO2_5); | ||
881 | else | ||
882 | /* Ext PA Controls for 4331 12x12 Package */ | ||
883 | bcma_set32(cc, CHIPCREGOFFS(chipcontrol), | ||
884 | CCTRL4331_EXTPA_EN); | ||
885 | } else { | ||
886 | val &= ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5); | ||
887 | bcma_mask32(cc, CHIPCREGOFFS(chipcontrol), | ||
888 | ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5)); | ||
889 | } | ||
890 | } | ||
891 | |||
892 | /* Enable BT-COEX & Ex-PA for 4313 */ | 868 | /* Enable BT-COEX & Ex-PA for 4313 */ |
893 | void ai_epa_4313war(struct si_pub *sih) | 869 | void ai_epa_4313war(struct si_pub *sih) |
894 | { | 870 | { |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h index 39942572013b..7c6108a2f44d 100644 --- 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); | |||
207 | extern void ai_pci_up(struct si_pub *sih); | 207 | extern void ai_pci_up(struct si_pub *sih); |
208 | extern int ai_pci_fixcfg(struct si_pub *sih); | 208 | extern int ai_pci_fixcfg(struct si_pub *sih); |
209 | 209 | ||
210 | extern void ai_chipcontrl_epa4331(struct si_pub *sih, bool on); | ||
211 | /* Enable Ex-PA for 4313 */ | 210 | /* Enable Ex-PA for 4313 */ |
212 | extern void ai_epa_4313war(struct si_pub *sih); | 211 | extern void ai_epa_4313war(struct si_pub *sih); |
213 | 212 | ||