linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org,
	linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 16/18] staging: rtl8188eu: simplify path_adda_on
Date: Sun, 25 Jul 2021 17:59:00 +0200	[thread overview]
Message-ID: <20210725155902.32433-16-martin@kaiser.cx> (raw)
In-Reply-To: <20210725155902.32433-1-martin@kaiser.cx>

path_adda_on's is2t parameter is always false.
Remove some code that would be called only for is2t == true.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/rtl8188eu/hal/phy.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 62f979ceadc6..faa94dc7190c 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -711,19 +711,13 @@ static void reload_mac_registers(struct adapter *adapt, const u32 *mac_reg,
 	usb_write32(adapt, mac_reg[i], backup[i]);
 }
 
-static void path_adda_on(struct adapter *adapt, const u32 *adda_reg,
-			 bool is_path_a_on, bool is2t)
+static void path_adda_on(struct adapter *adapt, const u32 *adda_reg, bool is_path_a_on)
 {
 	u32 path_on;
 	u32 i;
 
-	if (!is2t) {
-		path_on = 0x0bdb25a0;
-		phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, 0x0b1b25a0);
-	} else {
-		path_on = is_path_a_on ? 0x04db25a4 : 0x0b1b25a4;
-		phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, path_on);
-	}
+	path_on = 0x0bdb25a0;
+	phy_set_bb_reg(adapt, adda_reg[0], bMaskDWord, 0x0b1b25a0);
 
 	for (i = 1; i < IQK_ADDA_REG_NUM; i++)
 		phy_set_bb_reg(adapt, adda_reg[i], bMaskDWord, path_on);
@@ -870,7 +864,7 @@ static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8],
 				    dm_odm->RFCalibrateInfo.IQK_BB_backup, IQK_BB_REG_NUM);
 	}
 
-	path_adda_on(adapt, adda_reg, true, false);
+	path_adda_on(adapt, adda_reg, true);
 	if (t == 0)
 		dm_odm->RFCalibrateInfo.bRfPiEnable = (u8)phy_query_bb_reg(adapt, rFPGA0_XA_HSSIParameter1,
 									   BIT(8));
-- 
2.20.1


  parent reply	other threads:[~2021-07-25 16:00 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-25 15:58 [PATCH 01/18] staging: rtl8188eu: remove unused defines Martin Kaiser
2021-07-25 15:58 ` [PATCH 02/18] staging: rtl8188eu: remove HW_VAR_MEDIA_STATUS1 Martin Kaiser
2021-07-25 15:58 ` [PATCH 03/18] staging: rtl8188eu: remove HW_VAR_TXPAUSE Martin Kaiser
2021-07-25 15:58 ` [PATCH 04/18] staging: rtl8188eu: simplify Hal_EfuseParseMACAddr_8188EU Martin Kaiser
2021-07-25 15:58 ` [PATCH 05/18] staging: rtl8188eu: remove an unused enum Martin Kaiser
2021-07-25 15:58 ` [PATCH 06/18] staging: rtl8188eu: remove another " Martin Kaiser
2021-07-25 15:58 ` [PATCH 07/18] staging: rtl8188eu: remove a bunch of unused defines Martin Kaiser
2021-07-25 15:58 ` [PATCH 08/18] staging: rtl8188eu: remove yet another unused enum Martin Kaiser
2021-07-25 15:58 ` [PATCH 09/18] staging: rtl8188eu: remove unused _HAL_INTF_C_ define Martin Kaiser
2021-07-25 16:32   ` Christophe JAILLET
2021-07-25 16:38     ` Greg Kroah-Hartman
2021-07-25 16:45       ` Christophe JAILLET
2021-07-25 15:58 ` [PATCH 10/18] staging: rtl8188eu: remove write-only power struct component Martin Kaiser
2021-07-25 15:58 ` [PATCH 11/18] staging: rtl8188eu: remove two write-only hal components Martin Kaiser
2021-07-25 15:58 ` [PATCH 12/18] staging: rtl8188eu: remove unused IntrMask Martin Kaiser
2021-07-25 15:58 ` [PATCH 13/18] staging: rtl8188eu: remove write-only HwRxPageSize Martin Kaiser
2021-07-25 15:58 ` [PATCH 14/18] staging: rtl8188eu: simplify rtl88eu_phy_iq_calibrate Martin Kaiser
2021-07-25 18:47   ` kernel test robot
2021-07-25 21:03   ` kernel test robot
2021-07-26 19:53   ` [PATCH v2 " Martin Kaiser
2021-07-25 15:58 ` [PATCH 15/18] staging: rtl8188eu: simplify phy_iq_calibrate Martin Kaiser
2021-07-25 15:59 ` Martin Kaiser [this message]
2021-07-25 15:59 ` [PATCH 17/18] staging: rtl8188eu: simplify phy_lc_calibrate Martin Kaiser
2021-07-25 15:59 ` [PATCH 18/18] staging: rtl8188eu: remove unused IQKMatrixRegSetting array Martin Kaiser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210725155902.32433-16-martin@kaiser.cx \
    --to=martin@kaiser.cx \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --subject='Re: [PATCH 16/18] staging: rtl8188eu: simplify path_adda_on' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).