brcm80211: smac: replace ai_corereg() function with ai_cc_reg()

The ai_corereg() function is only used in the driver to safely
access the chipcommon core. The function has been renamed to
ai_cc_reg() removing the need to provide a core index parameter.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 5db2bdc67a56..7ee86d4a056e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -1709,17 +1709,17 @@ void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
 {
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_addr), ~0, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_addr),
+                  ~0, 0);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 0);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 4);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 4);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 0);
         udelay(1);
 }