From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944973AbcJSP00 (ORCPT ); Wed, 19 Oct 2016 11:26:26 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35584 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943815AbcJSPFu (ORCPT ); Wed, 19 Oct 2016 11:05:50 -0400 From: Ivan Safonov To: Greg Kroah-Hartman , Bhaktipriya Shridhar , Andy Shevchenko , Geliang Tang , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: insafonov@gmail.com Subject: [PATCH 09/37] staging:r8188eu: remove is2t argument of phy_lc_calibrate function Date: Wed, 19 Oct 2016 22:07:37 +0700 Message-Id: <1476889685-7367-9-git-send-email-insafonov@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1476889685-7367-1-git-send-email-insafonov@gmail.com> References: <1476889685-7367-1-git-send-email-insafonov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org is2t is constant. Signed-off-by: Ivan Safonov --- drivers/staging/rtl8188eu/hal/phy.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c index 6b70d09..93dbb395 100644 --- a/drivers/staging/rtl8188eu/hal/phy.c +++ b/drivers/staging/rtl8188eu/hal/phy.c @@ -1014,10 +1014,10 @@ static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8], u8 t) } } -static void phy_lc_calibrate(struct adapter *adapt, bool is2t) +static void phy_lc_calibrate(struct adapter *adapt) { u8 tmpreg; - u32 rf_a_mode = 0, rf_b_mode = 0, lc_cal; + u32 rf_a_mode = 0, lc_cal; /* Check continuous TX and Packet TX */ tmpreg = usb_read8(adapt, 0xd03); @@ -1033,20 +1033,10 @@ static void phy_lc_calibrate(struct adapter *adapt, bool is2t) rf_a_mode = rtw_hal_read_rfreg(adapt, RF_PATH_A, RF_AC, bMask12Bits); - /* Path-B */ - if (is2t) - rf_b_mode = rtw_hal_read_rfreg(adapt, RF_PATH_B, RF_AC, - bMask12Bits); - /* 2. Set RF mode = standby mode */ /* Path-A */ phy_set_rf_reg(adapt, RF_PATH_A, RF_AC, bMask12Bits, (rf_a_mode&0x8FFFF)|0x10000); - - /* Path-B */ - if (is2t) - phy_set_rf_reg(adapt, RF_PATH_B, RF_AC, bMask12Bits, - (rf_b_mode&0x8FFFF)|0x10000); } /* 3. Read RF reg18 */ @@ -1064,11 +1054,6 @@ static void phy_lc_calibrate(struct adapter *adapt, bool is2t) /* Path-A */ usb_write8(adapt, 0xd03, tmpreg); phy_set_rf_reg(adapt, RF_PATH_A, RF_AC, bMask12Bits, rf_a_mode); - - /* Path-B */ - if (is2t) - phy_set_rf_reg(adapt, RF_PATH_B, RF_AC, bMask12Bits, - rf_b_mode); } else { /* Deal with Packet TX case */ usb_write8(adapt, REG_TXPAUSE, 0x00); @@ -1210,7 +1195,7 @@ void rtl88eu_phy_lc_calibrate(struct adapter *adapt) dm_odm->RFCalibrateInfo.bLCKInProgress = true; - phy_lc_calibrate(adapt, false); + phy_lc_calibrate(adapt); dm_odm->RFCalibrateInfo.bLCKInProgress = false; } -- 2.7.3