From patchwork Tue Dec 19 06:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Hui X-Patchwork-Id: 180793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1759397dyi; Mon, 18 Dec 2023 23:03:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3h9X9q5SPDGe66grUn6Pskx95UNzsapddN/PZ/HNe/QiaBU7f+G+XwL8z8DrL21iV0FK0 X-Received: by 2002:a17:903:a88:b0:1d3:d0b5:4de0 with SMTP id mo8-20020a1709030a8800b001d3d0b54de0mr1231206plb.53.1702969418770; Mon, 18 Dec 2023 23:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702969418; cv=none; d=google.com; s=arc-20160816; b=WewDH9WLFmN68BUnN+Ppss3zbxeoeuonKWL7pAN4nF/5Qf/tz/v9SAvLhqh88b/rXd kSsmHFDqfYozsJN33cMQ0RZ8HnLq3pWE5EjSCim4tDg5YGNxtbXP9SCeMdbuAsfG3735 kNZ7L/C0R06Ut9Chgf8hzcTJkSZnUJA3I1PU1HVkR4ypfaAanA8+IjG94giRNgmziB+L NJWtV669w9bP6cFvCZdlPh8+G8K9Tx5EMVyW3Hfv6j5sJMLveijL1hv2kRajlQEzPxe5 C8EQdXzO9IT7/OaKZ1KTBi5kUTD8RWOkTOV6IejeptAwCOHQ30e6yfgAOPpAdWjTs2ID YnBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:in-reply-to:message-id:date :subject:cc:to:from; bh=OXXEXbSOIsLyrzRY5ZkvijwpNQBaTPPxydb9P1IM7EA=; fh=oAKK2Tmfich+PEAEhU13cYP9znewSj73CMUuWFedCmY=; b=jpabd/zrZdDRZkIFnGOqT0A/0MI9ZNmVf1fNucgnN8v1ZPgGKa9Ca9hD6ukiV6701f sagSctfopVMTw0y642dvN+0l9N9HXLsyz3FnJVsoE+SB20nyhIMjTjNV2ymi1NOXpT+Z uXRcgc6gIaBmu43YOjve2uNRoPVDJi5vduFIahpZTJZBtTb7IgnjWWlY+kcepTfnM7Wu toDfNixxl1TYyK0wQjgz50QvarW1eFegxp1JG4PM6AP3A58JXuGZ4gW6gqqC5ReN1sdS Ky+q8ilv+z6A6PiOX3rfNCtYcxpk9nbQFilBEs3JtJpUYVrHmj9nFuDjgdY/DGgL4Ac6 Eohw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4768-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id s17-20020a170902ea1100b001d0aeda9adbsi19446486plg.300.2023.12.18.23.03.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 23:03:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-4768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4768-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4768-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id AB1FBB24D61 for ; Tue, 19 Dec 2023 07:00:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C385156D9; Tue, 19 Dec 2023 06:58:14 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mail.nfschina.com (unknown [42.101.60.195]) by smtp.subspace.kernel.org (Postfix) with SMTP id 6F9CB107B7; Tue, 19 Dec 2023 06:58:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nfschina.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nfschina.com Received: from localhost.localdomain (unknown [180.167.10.98]) by mail.nfschina.com (Maildata Gateway V2.8.8) with ESMTPSA id 1BDF360F259C0; Tue, 19 Dec 2023 14:57:56 +0800 (CST) X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: pkshih@realtek.com, kvalo@kernel.org Cc: Su Hui , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH wireless-next 02/11] wifi: rtlwifi: rtl8821ae: phy: using calculate_bit_shift() Date: Tue, 19 Dec 2023 14:57:30 +0800 Message-Id: <20231219065739.1895666-3-suhui@nfschina.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231219065739.1895666-1-suhui@nfschina.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785692861522388377 X-GMAIL-MSGID: 1785692861522388377 using calculate_bit_shift() to replace _rtl8821ae_phy_calculate_bit_shift(). Signed-off-by: Su Hui --- .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c index 68c3fb0395ce..1be51ea3f3c8 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c @@ -27,13 +27,6 @@ static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw, static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset, u32 data); -static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask) -{ - if (WARN_ON_ONCE(!bitmask)) - return 0; - - return __ffs(bitmask); -} static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw); /*static bool _rtl8812ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);*/ static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw); @@ -106,7 +99,7 @@ u32 rtl8821ae_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask); originalvalue = rtl_read_dword(rtlpriv, regaddr); - bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, @@ -127,7 +120,7 @@ void rtl8821ae_phy_set_bb_reg(struct ieee80211_hw *hw, if (bitmask != MASKDWORD) { originalvalue = rtl_read_dword(rtlpriv, regaddr); - bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); data = ((originalvalue & (~bitmask)) | ((data << bitshift) & bitmask)); } @@ -153,7 +146,7 @@ u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw, spin_lock(&rtlpriv->locks.rf_lock); original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr); - bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); readback_value = (original_value & bitmask) >> bitshift; spin_unlock(&rtlpriv->locks.rf_lock); @@ -181,7 +174,7 @@ void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw, if (bitmask != RFREG_OFFSET_MASK) { original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr); - bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }