Return-path: Received: from mail-px0-f196.google.com ([209.85.216.196]:42757 "EHLO mail-px0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755996AbZHNVbS (ORCPT ); Fri, 14 Aug 2009 17:31:18 -0400 Received: by pxi34 with SMTP id 34so461187pxi.4 for ; Fri, 14 Aug 2009 14:31:19 -0700 (PDT) Message-ID: <4A85D7A3.9020009@lwfinger.net> Date: Fri, 14 Aug 2009 16:31:15 -0500 From: Larry Finger MIME-Version: 1.0 To: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= CC: John Linville , Michael Buesch , Mark Huijgen , Broadcom Wireless , linux-wireless Subject: Re: [PATCH] b43: LP-PHY: Fix another TX power control abuse References: <4A85D070.6070702@gmail.com> In-Reply-To: <4A85D070.6070702@gmail.com> Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: Gábor Stefanik wrote: > This should fix the remaining WARN_ON. > > Signed-off-by: Gábor Stefanik > --- > drivers/net/wireless/b43/phy_lp.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/b43/phy_lp.c > b/drivers/net/wireless/b43/phy_lp.c > index bf89173..3872a31 100644 > --- a/drivers/net/wireless/b43/phy_lp.c > +++ b/drivers/net/wireless/b43/phy_lp.c > @@ -1059,7 +1059,8 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev > *dev) > bool old_txg_ovr; > u8 old_bbmult; > u16 old_rf_ovr, old_rf_ovrval, old_afe_ovr, old_afe_ovrval, > - old_rf2_ovr, old_rf2_ovrval, old_phy_ctl, old_txpctl; > + old_rf2_ovr, old_rf2_ovrval, old_phy_ctl; > + enum b43_lpphy_txpctl_mode old_txpctl; > u32 normal_pwr, ideal_pwr, mean_sq_pwr, tmp = 0, mean_sq_pwr_min = 0; > int loopback, i, j, inner_sum; > > @@ -1077,8 +1078,8 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev > *dev) > old_rf2_ovr = b43_phy_read(dev, B43_LPPHY_RF_OVERRIDE_2); > old_rf2_ovrval = b43_phy_read(dev, B43_LPPHY_RF_OVERRIDE_2_VAL); > old_phy_ctl = b43_phy_read(dev, B43_LPPHY_LP_PHY_CTL); > - old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) & > - B43_LPPHY_TX_PWR_CTL_CMD_MODE; > + lpphy_read_tx_pctl_mode_from_hardware(dev); > + old_txpctl = lpphy->txpctl_mode; > > lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF); > lpphy_disable_crs(dev); Yes, this one got rid of the warnings. Larry