staging: brcm80211: change parameter in driver variable lookup

The functions getvar() and getintvar() had to pass the buffer
containing the driver variables. Now they pass the structure
containing this buffer hiding what type of buffer/container
is used for storing the driver variables.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 138 insertions, 147 deletions

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
index dbeeeba755f3..d84e1cf5dc5b 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -4817,27 +4817,25 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 	s8 txpwr = 0;
 	int i;
 	struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;
+	struct phy_shim_info *shim = pi->sh->physhim;
 
 	if (CHSPEC_IS2G(pi->radio_chanspec)) {
 		u16 cckpo = 0;
 		u32 offset_ofdm, offset_mcs;
 
 		pi_lcn->lcnphy_tr_isolation_mid =
-			(u8) wlapi_getintvar(pi->vars, "triso2g");
+			(u8)wlapi_getintvar(shim, "triso2g");
 
 		pi_lcn->lcnphy_rx_power_offset =
-			(u8) wlapi_getintvar(pi->vars, "rxpo2g");
+			(u8)wlapi_getintvar(shim, "rxpo2g");
 
-		pi->txpa_2g[0] = (s16) wlapi_getintvar(pi->vars, "pa0b0");
-		pi->txpa_2g[1] = (s16) wlapi_getintvar(pi->vars, "pa0b1");
-		pi->txpa_2g[2] = (s16) wlapi_getintvar(pi->vars, "pa0b2");
+		pi->txpa_2g[0] = (s16)wlapi_getintvar(shim, "pa0b0");
+		pi->txpa_2g[1] = (s16)wlapi_getintvar(shim, "pa0b1");
+		pi->txpa_2g[2] = (s16)wlapi_getintvar(shim, "pa0b2");
 
-		pi_lcn->lcnphy_rssi_vf =
-				(u8) wlapi_getintvar(pi->vars, "rssismf2g");
-		pi_lcn->lcnphy_rssi_vc =
-				(u8) wlapi_getintvar(pi->vars, "rssismc2g");
-		pi_lcn->lcnphy_rssi_gs =
-				(u8) wlapi_getintvar(pi->vars, "rssisav2g");
+		pi_lcn->lcnphy_rssi_vf = (u8)wlapi_getintvar(shim, "rssismf2g");
+		pi_lcn->lcnphy_rssi_vc = (u8)wlapi_getintvar(shim, "rssismc2g");
+		pi_lcn->lcnphy_rssi_gs = (u8)wlapi_getintvar(shim, "rssisav2g");
 
 		pi_lcn->lcnphy_rssi_vf_lowtemp = pi_lcn->lcnphy_rssi_vf;
 		pi_lcn->lcnphy_rssi_vc_lowtemp = pi_lcn->lcnphy_rssi_vc;
@@ -4847,7 +4845,7 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 		pi_lcn->lcnphy_rssi_vc_hightemp = pi_lcn->lcnphy_rssi_vc;
 		pi_lcn->lcnphy_rssi_gs_hightemp = pi_lcn->lcnphy_rssi_gs;
 
-		txpwr = (s8) wlapi_getintvar(pi->vars, "maxp2ga0");
+		txpwr = (s8)wlapi_getintvar(shim, "maxp2ga0");
 		pi->tx_srom_max_2g = txpwr;
 
 		for (i = 0; i < PWRTBL_NUM_COEFF; i++) {
@@ -4855,7 +4853,7 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 			pi->txpa_2g_high_temp[i] = pi->txpa_2g[i];
 		}
 
-		cckpo = (u16) wlapi_getintvar(pi->vars, "cck2gpo");
+		cckpo = (u16)wlapi_getintvar(shim, "cck2gpo");
 		if (cckpo) {
 			uint max_pwr_chan = txpwr;
 
@@ -4865,8 +4863,7 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 				cckpo >>= 4;
 			}
 
-			offset_ofdm =
-				(u32) wlapi_getintvar(pi->vars, "ofdm2gpo");
+			offset_ofdm = (u32)wlapi_getintvar(shim, "ofdm2gpo");
 			for (i = TXP_FIRST_OFDM; i <= TXP_LAST_OFDM; i++) {
 				pi->tx_srom_max_rate_2g[i] =
 					max_pwr_chan -
@@ -4876,13 +4873,12 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 		} else {
 			u8 opo = 0;
 
-			opo = (u8) wlapi_getintvar(pi->vars, "opo");
+			opo = (u8)wlapi_getintvar(shim, "opo");
 
 			for (i = TXP_FIRST_CCK; i <= TXP_LAST_CCK; i++)
 				pi->tx_srom_max_rate_2g[i] = txpwr;
 
-			offset_ofdm =
-				(u32) wlapi_getintvar(pi->vars, "ofdm2gpo");
+			offset_ofdm = (u32)wlapi_getintvar(shim, "ofdm2gpo");
 
 			for (i = TXP_FIRST_OFDM; i <= TXP_LAST_OFDM; i++) {
 				pi->tx_srom_max_rate_2g[i] = txpwr -
@@ -4890,9 +4886,9 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 				offset_ofdm >>= 4;
 			}
 			offset_mcs =
-				wlapi_getintvar(pi->vars, "mcs2gpo1") << 16;
+				wlapi_getintvar(shim, "mcs2gpo1") << 16;
 			offset_mcs |=
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo0");
+				(u16) wlapi_getintvar(shim, "mcs2gpo0");
 			pi_lcn->lcnphy_mcs20_po = offset_mcs;
 			for (i = TXP_FIRST_SISO_MCS_20;
 			     i <= TXP_LAST_SISO_MCS_20; i++) {
@@ -4903,30 +4899,30 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi)
 		}
 
 		pi_lcn->lcnphy_rawtempsense =
-			(u16) wlapi_getintvar(pi->vars, "rawtempsense");
+			(u16)wlapi_getintvar(shim, "rawtempsense");
 		pi_lcn->lcnphy_measPower =
-			(u8) wlapi_getintvar(pi->vars, "measpower");
+			(u8)wlapi_getintvar(shim, "measpower");
 		pi_lcn->lcnphy_tempsense_slope =
-			(u8) wlapi_getintvar(pi->vars, "tempsense_slope");
+			(u8)wlapi_getintvar(shim, "tempsense_slope");
 		pi_lcn->lcnphy_hw_iqcal_en =
-			(bool) wlapi_getintvar(pi->vars, "hw_iqcal_en");
+			(bool)wlapi_getintvar(shim, "hw_iqcal_en");
 		pi_lcn->lcnphy_iqcal_swp_dis =
-			(bool) wlapi_getintvar(pi->vars, "iqcal_swp_dis");
+			(bool)wlapi_getintvar(shim, "iqcal_swp_dis");
 		pi_lcn->lcnphy_tempcorrx =
-			(u8) wlapi_getintvar(pi->vars, "tempcorrx");
+			(u8)wlapi_getintvar(shim, "tempcorrx");
 		pi_lcn->lcnphy_tempsense_option =
-			(u8) wlapi_getintvar(pi->vars, "tempsense_option");
+			(u8)wlapi_getintvar(shim, "tempsense_option");
 		pi_lcn->lcnphy_freqoffset_corr =
-			(u8) wlapi_getintvar(pi->vars, "freqoffset_corr");
-		if ((u8) getintvar(pi->vars, "aa2g") > 1)
+			(u8)wlapi_getintvar(shim, "freqoffset_corr");
+		if ((u8)wlapi_getintvar(shim, "aa2g") > 1)
 			wlc_phy_ant_rxdiv_set((struct brcms_phy_pub *) pi,
-					      (u8) getintvar(pi->vars,
-							     "aa2g"));
+					      (u8) wlapi_getintvar(shim,
+								   "aa2g"));
 	}
 	pi_lcn->lcnphy_cck_dig_filt_type = -1;
-	if (wlapi_getvar(pi->vars, "cckdigfilttype")) {
+	if (wlapi_getvar(shim, "cckdigfilttype")) {
 		s16 temp;
-		temp = (s16) wlapi_getintvar(pi->vars, "cckdigfilttype");
+		temp = (s16)wlapi_getintvar(shim, "cckdigfilttype");
 		if (temp >= 0)
 			pi_lcn->lcnphy_cck_dig_filt_type = temp;
 	}
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
index c410bf04c265..a4417e9ab901 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
@@ -14383,29 +14383,30 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)
 {
 	u16 bw40po, cddpo, stbcpo, bwduppo;
 	uint band_num;
+	struct phy_shim_info *shim = pi->sh->physhim;
 
 	if (pi->sh->sromrev >= 9)
 		return;
 
-	bw40po = (u16) wlapi_getintvar(pi->vars, "bw40po");
+	bw40po = (u16) wlapi_getintvar(shim, "bw40po");
 	pi->bw402gpo = bw40po & 0xf;
 	pi->bw405gpo = (bw40po & 0xf0) >> 4;
 	pi->bw405glpo = (bw40po & 0xf00) >> 8;
 	pi->bw405ghpo = (bw40po & 0xf000) >> 12;
 
-	cddpo = (u16) wlapi_getintvar(pi->vars, "cddpo");
+	cddpo = (u16) wlapi_getintvar(shim, "cddpo");
 	pi->cdd2gpo = cddpo & 0xf;
 	pi->cdd5gpo = (cddpo & 0xf0) >> 4;
 	pi->cdd5glpo = (cddpo & 0xf00) >> 8;
 	pi->cdd5ghpo = (cddpo & 0xf000) >> 12;
 
-	stbcpo = (u16) wlapi_getintvar(pi->vars, "stbcpo");
+	stbcpo = (u16) wlapi_getintvar(shim, "stbcpo");
 	pi->stbc2gpo = stbcpo & 0xf;
 	pi->stbc5gpo = (stbcpo & 0xf0) >> 4;
 	pi->stbc5glpo = (stbcpo & 0xf00) >> 8;
 	pi->stbc5ghpo = (stbcpo & 0xf000) >> 12;
 
-	bwduppo = (u16) wlapi_getintvar(pi->vars, "bwduppo");
+	bwduppo = (u16) wlapi_getintvar(shim, "bwduppo");
 	pi->bwdup2gpo = bwduppo & 0xf;
 	pi->bwdup5gpo = (bwduppo & 0xf0) >> 4;
 	pi->bwdup5glpo = (bwduppo & 0xf00) >> 8;
@@ -14417,188 +14418,186 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)
 		case 0:
 
 			pi->nphy_txpid2g[PHY_CORE_0] =
-				(u8) wlapi_getintvar(pi->vars, "txpid2ga0");
+				(u8) wlapi_getintvar(shim, "txpid2ga0");
 			pi->nphy_txpid2g[PHY_CORE_1] =
-				(u8) wlapi_getintvar(pi->vars, "txpid2ga1");
+				(u8) wlapi_getintvar(shim, "txpid2ga1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_2g =
-				(s8) wlapi_getintvar(pi->vars, "maxp2ga0");
+				(s8) wlapi_getintvar(shim, "maxp2ga0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_2g =
-				(s8) wlapi_getintvar(pi->vars, "maxp2ga1");
+				(s8) wlapi_getintvar(shim, "maxp2ga1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw0a0");
+				(s16) wlapi_getintvar(shim, "pa2gw0a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw0a1");
+				(s16) wlapi_getintvar(shim, "pa2gw0a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw1a0");
+				(s16) wlapi_getintvar(shim, "pa2gw1a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw1a1");
+				(s16) wlapi_getintvar(shim, "pa2gw1a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw2a0");
+				(s16) wlapi_getintvar(shim, "pa2gw2a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa2gw2a1");
+				(s16) wlapi_getintvar(shim, "pa2gw2a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_2g =
-				(s8) wlapi_getintvar(pi->vars, "itt2ga0");
+				(s8) wlapi_getintvar(shim, "itt2ga0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_2g =
-				(s8) wlapi_getintvar(pi->vars, "itt2ga1");
+				(s8) wlapi_getintvar(shim, "itt2ga1");
 
-			pi->cck2gpo =
-				(u16) wlapi_getintvar(pi->vars, "cck2gpo");
-			pi->ofdm2gpo =
-				(u32) wlapi_getintvar(pi->vars, "ofdm2gpo");
+			pi->cck2gpo = (u16) wlapi_getintvar(shim, "cck2gpo");
+
+			pi->ofdm2gpo = (u32) wlapi_getintvar(shim, "ofdm2gpo");
 
 			pi->mcs2gpo[0] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo0");
+				(u16) wlapi_getintvar(shim, "mcs2gpo0");
 			pi->mcs2gpo[1] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo1");
+				(u16) wlapi_getintvar(shim, "mcs2gpo1");
 			pi->mcs2gpo[2] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo2");
+				(u16) wlapi_getintvar(shim, "mcs2gpo2");
 			pi->mcs2gpo[3] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo3");
+				(u16) wlapi_getintvar(shim, "mcs2gpo3");
 			pi->mcs2gpo[4] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo4");
+				(u16) wlapi_getintvar(shim, "mcs2gpo4");
 			pi->mcs2gpo[5] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo5");
+				(u16) wlapi_getintvar(shim, "mcs2gpo5");
 			pi->mcs2gpo[6] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo6");
+				(u16) wlapi_getintvar(shim, "mcs2gpo6");
 			pi->mcs2gpo[7] =
-				(u16) wlapi_getintvar(pi->vars, "mcs2gpo7");
+				(u16) wlapi_getintvar(shim, "mcs2gpo7");
 			break;
 		case 1:
 
 			pi->nphy_txpid5g[PHY_CORE_0] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5ga0");
+				(u8) wlapi_getintvar(shim, "txpid5ga0");
 			pi->nphy_txpid5g[PHY_CORE_1] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5ga1");
+				(u8) wlapi_getintvar(shim, "txpid5ga1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_5gm =
-				(s8) wlapi_getintvar(pi->vars, "maxp5ga0");
+				(s8) wlapi_getintvar(shim, "maxp5ga0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_5gm =
-				(s8) wlapi_getintvar(pi->vars, "maxp5ga1");
+				(s8) wlapi_getintvar(shim, "maxp5ga1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw0a0");
+				(s16) wlapi_getintvar(shim, "pa5gw0a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw0a1");
+				(s16) wlapi_getintvar(shim, "pa5gw0a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw1a0");
+				(s16) wlapi_getintvar(shim, "pa5gw1a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw1a1");
+				(s16) wlapi_getintvar(shim, "pa5gw1a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw2a0");
+				(s16) wlapi_getintvar(shim, "pa5gw2a0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5gw2a1");
+				(s16) wlapi_getintvar(shim, "pa5gw2a1");
 			pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_5gm =
-				(s8) wlapi_getintvar(pi->vars, "itt5ga0");
+				(s8) wlapi_getintvar(shim, "itt5ga0");
 			pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_5gm =
-				(s8) wlapi_getintvar(pi->vars, "itt5ga1");
+				(s8) wlapi_getintvar(shim, "itt5ga1");
 
-			pi->ofdm5gpo =
-				(u32) wlapi_getintvar(pi->vars, "ofdm5gpo");
+			pi->ofdm5gpo = (u32) wlapi_getintvar(shim, "ofdm5gpo");
 
 			pi->mcs5gpo[0] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo0");
+				(u16) wlapi_getintvar(shim, "mcs5gpo0");
 			pi->mcs5gpo[1] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo1");
+				(u16) wlapi_getintvar(shim, "mcs5gpo1");
 			pi->mcs5gpo[2] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo2");
+				(u16) wlapi_getintvar(shim, "mcs5gpo2");
 			pi->mcs5gpo[3] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo3");
+				(u16) wlapi_getintvar(shim, "mcs5gpo3");
 			pi->mcs5gpo[4] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo4");
+				(u16) wlapi_getintvar(shim, "mcs5gpo4");
 			pi->mcs5gpo[5] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo5");
+				(u16) wlapi_getintvar(shim, "mcs5gpo5");
 			pi->mcs5gpo[6] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo6");
+				(u16) wlapi_getintvar(shim, "mcs5gpo6");
 			pi->mcs5gpo[7] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5gpo7");
+				(u16) wlapi_getintvar(shim, "mcs5gpo7");
 			break;
 		case 2:
 
 			pi->nphy_txpid5gl[0] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5gla0");
+				(u8) wlapi_getintvar(shim, "txpid5gla0");
 			pi->nphy_txpid5gl[1] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5gla1");
+				(u8) wlapi_getintvar(shim, "txpid5gla1");
 			pi->nphy_pwrctrl_info[0].max_pwr_5gl =
-				(s8) wlapi_getintvar(pi->vars, "maxp5gla0");
+				(s8) wlapi_getintvar(shim, "maxp5gla0");
 			pi->nphy_pwrctrl_info[1].max_pwr_5gl =
-				(s8) wlapi_getintvar(pi->vars, "maxp5gla1");
+				(s8) wlapi_getintvar(shim, "maxp5gla1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gl_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw0a0");
+				(s16) wlapi_getintvar(shim, "pa5glw0a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gl_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw0a1");
+				(s16) wlapi_getintvar(shim, "pa5glw0a1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gl_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw1a0");
+				(s16) wlapi_getintvar(shim, "pa5glw1a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gl_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw1a1");
+				(s16) wlapi_getintvar(shim, "pa5glw1a1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gl_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw2a0");
+				(s16) wlapi_getintvar(shim, "pa5glw2a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gl_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5glw2a1");
+				(s16) wlapi_getintvar(shim, "pa5glw2a1");
 			pi->nphy_pwrctrl_info[0].idle_targ_5gl = 0;
 			pi->nphy_pwrctrl_info[1].idle_targ_5gl = 0;
 
 			pi->ofdm5glpo =
-				(u32) wlapi_getintvar(pi->vars, "ofdm5glpo");
+				(u32) wlapi_getintvar(shim, "ofdm5glpo");
 
 			pi->mcs5glpo[0] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo0");
+				(u16) wlapi_getintvar(shim, "mcs5glpo0");
 			pi->mcs5glpo[1] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo1");
+				(u16) wlapi_getintvar(shim, "mcs5glpo1");
 			pi->mcs5glpo[2] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo2");
+				(u16) wlapi_getintvar(shim, "mcs5glpo2");
 			pi->mcs5glpo[3] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo3");
+				(u16) wlapi_getintvar(shim, "mcs5glpo3");
 			pi->mcs5glpo[4] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo4");
+				(u16) wlapi_getintvar(shim, "mcs5glpo4");
 			pi->mcs5glpo[5] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo5");
+				(u16) wlapi_getintvar(shim, "mcs5glpo5");
 			pi->mcs5glpo[6] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo6");
+				(u16) wlapi_getintvar(shim, "mcs5glpo6");
 			pi->mcs5glpo[7] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5glpo7");
+				(u16) wlapi_getintvar(shim, "mcs5glpo7");
 			break;
 		case 3:
 
 			pi->nphy_txpid5gh[0] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5gha0");
+				(u8) wlapi_getintvar(shim, "txpid5gha0");
 			pi->nphy_txpid5gh[1] =
-				(u8) wlapi_getintvar(pi->vars, "txpid5gha1");
+				(u8) wlapi_getintvar(shim, "txpid5gha1");
 			pi->nphy_pwrctrl_info[0].max_pwr_5gh =
-				(s8) wlapi_getintvar(pi->vars, "maxp5gha0");
+				(s8) wlapi_getintvar(shim, "maxp5gha0");
 			pi->nphy_pwrctrl_info[1].max_pwr_5gh =
-				(s8) wlapi_getintvar(pi->vars, "maxp5gha1");
+				(s8) wlapi_getintvar(shim, "maxp5gha1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gh_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw0a0");
+				(s16) wlapi_getintvar(shim, "pa5ghw0a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gh_a1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw0a1");
+				(s16) wlapi_getintvar(shim, "pa5ghw0a1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gh_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw1a0");
+				(s16) wlapi_getintvar(shim, "pa5ghw1a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gh_b0 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw1a1");
+				(s16) wlapi_getintvar(shim, "pa5ghw1a1");
 			pi->nphy_pwrctrl_info[0].pwrdet_5gh_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw2a0");
+				(s16) wlapi_getintvar(shim, "pa5ghw2a0");
 			pi->nphy_pwrctrl_info[1].pwrdet_5gh_b1 =
-				(s16) wlapi_getintvar(pi->vars, "pa5ghw2a1");
+				(s16) wlapi_getintvar(shim, "pa5ghw2a1");
 			pi->nphy_pwrctrl_info[0].idle_targ_5gh = 0;
 			pi->nphy_pwrctrl_info[1].idle_targ_5gh = 0;
 
 			pi->ofdm5ghpo =
-				(u32) wlapi_getintvar(pi->vars, "ofdm5ghpo");
+				(u32) wlapi_getintvar(shim, "ofdm5ghpo");
 
 			pi->mcs5ghpo[0] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo0");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo0");
 			pi->mcs5ghpo[1] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo1");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo1");
 			pi->mcs5ghpo[2] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo2");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo2");
 			pi->mcs5ghpo[3] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo3");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo3");
 			pi->mcs5ghpo[4] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo4");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo4");
 			pi->mcs5ghpo[5] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo5");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo5");
 			pi->mcs5ghpo[6] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo6");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo6");
 			pi->mcs5ghpo[7] =
-				(u16) wlapi_getintvar(pi->vars, "mcs5ghpo7");
+				(u16) wlapi_getintvar(shim, "mcs5ghpo7");
 			break;
 		}
 	}
@@ -14608,41 +14607,37 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)
 
 static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)
 {
-
-	pi->antswitch = (u8) wlapi_getintvar(pi->vars, "antswitch");
-	pi->aa2g = (u8) wlapi_getintvar(pi->vars, "aa2g");
-	pi->aa5g = (u8) wlapi_getintvar(pi->vars, "aa5g");
-
-	pi->srom_fem2g.tssipos = (u8) wlapi_getintvar(pi->vars, "tssipos2g");
-	pi->srom_fem2g.extpagain =
-			(u8) wlapi_getintvar(pi->vars, "extpagain2g");
-	pi->srom_fem2g.pdetrange =
-			(u8) wlapi_getintvar(pi->vars, "pdetrange2g");
-	pi->srom_fem2g.triso = (u8) wlapi_getintvar(pi->vars, "triso2g");
-	pi->srom_fem2g.antswctrllut =
-			(u8) wlapi_getintvar(pi->vars, "antswctl2g");
-
-	pi->srom_fem5g.tssipos = (u8) wlapi_getintvar(pi->vars, "tssipos5g");
-	pi->srom_fem5g.extpagain =
-			(u8) wlapi_getintvar(pi->vars, "extpagain5g");
-	pi->srom_fem5g.pdetrange =
-			(u8) wlapi_getintvar(pi->vars, "pdetrange5g");
-	pi->srom_fem5g.triso = (u8) wlapi_getintvar(pi->vars, "triso5g");
-	if (wlapi_getvar(pi->vars, "antswctl5g"))
+	struct phy_shim_info *shim = pi->sh->physhim;
+
+	pi->antswitch = (u8) wlapi_getintvar(shim, "antswitch");
+	pi->aa2g = (u8) wlapi_getintvar(shim, "aa2g");
+	pi->aa5g = (u8) wlapi_getintvar(shim, "aa5g");
+
+	pi->srom_fem2g.tssipos = (u8) wlapi_getintvar(shim, "tssipos2g");
+	pi->srom_fem2g.extpagain = (u8) wlapi_getintvar(shim, "extpagain2g");
+	pi->srom_fem2g.pdetrange = (u8) wlapi_getintvar(shim, "pdetrange2g");
+	pi->srom_fem2g.triso = (u8) wlapi_getintvar(shim, "triso2g");
+	pi->srom_fem2g.antswctrllut = (u8) wlapi_getintvar(shim, "antswctl2g");
+
+	pi->srom_fem5g.tssipos = (u8) wlapi_getintvar(shim, "tssipos5g");
+	pi->srom_fem5g.extpagain = (u8) wlapi_getintvar(shim, "extpagain5g");
+	pi->srom_fem5g.pdetrange = (u8) wlapi_getintvar(shim, "pdetrange5g");
+	pi->srom_fem5g.triso = (u8) wlapi_getintvar(shim, "triso5g");
+	if (wlapi_getvar(shim, "antswctl5g"))
 		pi->srom_fem5g.antswctrllut =
-			(u8) wlapi_getintvar(pi->vars, "antswctl5g");
+			(u8) wlapi_getintvar(shim, "antswctl5g");
 	else
 		pi->srom_fem5g.antswctrllut =
-			(u8) wlapi_getintvar(pi->vars, "antswctl2g");
+			(u8) wlapi_getintvar(shim, "antswctl2g");
 
 	wlc_phy_txpower_ipa_upd(pi);
 
 	pi->phy_txcore_disable_temp =
-			(s16) wlapi_getintvar(pi->vars, "tempthresh");
+			(s16) wlapi_getintvar(shim, "tempthresh");
 	if (pi->phy_txcore_disable_temp == 0)
 		pi->phy_txcore_disable_temp = PHY_CHAIN_TX_DISABLE_TEMP;
 
-	pi->phy_tempsense_offset = (s8) wlapi_getintvar(pi->vars, "tempoffset");
+	pi->phy_tempsense_offset = (s8) wlapi_getintvar(shim, "tempoffset");
 	if (pi->phy_tempsense_offset != 0) {
 		if (pi->phy_tempsense_offset >
 		    (NPHY_SROM_TEMPSHIFT + NPHY_SROM_MAXTEMPOFFSET))
@@ -14658,7 +14653,7 @@ static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)
 		pi->phy_txcore_disable_temp - PHY_HYSTERESIS_DELTATEMP;
 
 	pi->phycal_tempdelta =
-			(u8) wlapi_getintvar(pi->vars, "phycal_tempdelta");
+			(u8) wlapi_getintvar(shim, "phycal_tempdelta");
 	if (pi->phycal_tempdelta > NPHY_CAL_MAXTEMPDELTA)
 		pi->phycal_tempdelta = 0;