From patchwork Tue Dec 19 06:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Hui X-Patchwork-Id: 180797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1762882dyi; Mon, 18 Dec 2023 23:11:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyhNB101BwpeUhw+yp5XjNsHyuydMRlVuz2mjSAHToLymWF6G+YaE6EZYzuYoMUXN3kz+m X-Received: by 2002:a50:cc4b:0:b0:54f:53b1:c942 with SMTP id n11-20020a50cc4b000000b0054f53b1c942mr4245573edi.109.1702969893657; Mon, 18 Dec 2023 23:11:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702969893; cv=none; d=google.com; s=arc-20160816; b=hYdSqXJ28e3ygIkbIpgIJ9JLlvUdHf+dd0jPwV+kTZPFoBdwzRnz0otEukmnqTLcwj i2tJf4H8w7j5es2fciaZ+ozQg8N+UL4263jlF2tXsPTz3ctqoEKU4dQfSYjT2vFg7fGH WXoq2miXju8JoJP4QGDRUrbDYDgeXqI60qh9VkaMRaTuiFun8ndFlKH2i6cgUhHKPSrb 07r3Mpk9b4C/s/B4FTowuGXS0jFJwZq+mPs4Mt/jn99prBckCmbjAad5Lk7/Lk4D6RUX JC3S8YP+F1dgjIHyDG4q2ME1ZmgO3omBKTlBb5UxK3OrPLIpNFCVdWepNF88ge0slhUm w8Og== 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=ICIBwKlU7JYIZrO0jxtRuKprv0M48qLWWYaY2gStL6g=; fh=2fCra+QI2qh0halP4Kp2qkpSMAyuATPLuCZ8W27+ut0=; b=D+YXP6xGnwI3BbBqzo1GyAHM8AGOb5ZjN9dT8N26IOhjJ8hUbh9CWzwCB7C3l4kYRf 6UI8etXULC36Qc7TwIUbbHqLYow/X2W2RLwoJx80Q/tY+QHkc6J4uRjJV/6cJxay4BcE FmA6yWpOnEwuz3AQIJHm8pyOl5FS6YB9Jvj9rAbHoAFUA3IsmdSLKYzseK/IvENIqVU8 NNEolffOmDlkyeScR7LB3XXTqZUsN2Jf/8T3BUQXNR08rc3gszPWV/5Y2d/o/nZCevSX E07sR85rLLvmNfMM4a4OyLbaFzXNJ4oJC0etVq5G9O/GHkzHPPIh0ds2Mp5CQ+F0oLUV 9G5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4775-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4775-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id c13-20020a50f60d000000b005539ed7d503si186865edn.5.2023.12.18.23.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 23:11:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-4775-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4775-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4775-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 am.mirrors.kernel.org (Postfix) with ESMTPS id EF0B71F26399 for ; Tue, 19 Dec 2023 07:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD15A18C03; Tue, 19 Dec 2023 06:58:44 +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 981798829; Tue, 19 Dec 2023 06:58:40 +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 2BFBF60F259C3; Tue, 19 Dec 2023 14:58:07 +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 , linville@tuxdriver.com, Larry.Finger@lwfinger.net, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH wireless-next 10/11] wifi: rtlwifi: rtl8723_common: using calculate_bit_shift() Date: Tue, 19 Dec 2023 14:57:38 +0800 Message-Id: <20231219065739.1895666-11-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: 1785693359126768680 X-GMAIL-MSGID: 1785693359126768680 Using calculate_bit_shift() to replace rtl8723_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem. Fixes: 0a168b48cdf7 ("rtlwifi: rtl8723ae: rtl8723-common: Create new driver for common code") Signed-off-by: Su Hui --- .../wireless/realtek/rtlwifi/rtl8723com/phy_common.c | 12 ++---------- .../wireless/realtek/rtlwifi/rtl8723com/phy_common.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c index 47b6c1aa36b0..d97c88ebce75 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c @@ -17,7 +17,7 @@ u32 rtl8723_phy_query_bb_reg(struct ieee80211_hw *hw, rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n", regaddr, bitmask); originalvalue = rtl_read_dword(rtlpriv, regaddr); - bitshift = rtl8723_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, @@ -39,7 +39,7 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, if (bitmask != MASKDWORD) { originalvalue = rtl_read_dword(rtlpriv, regaddr); - bitshift = rtl8723_phy_calculate_bit_shift(bitmask); + bitshift = calculate_bit_shift(bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); } @@ -51,14 +51,6 @@ void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, } EXPORT_SYMBOL_GPL(rtl8723_phy_set_bb_reg); -u32 rtl8723_phy_calculate_bit_shift(u32 bitmask) -{ - u32 i = ffs(bitmask); - - return i ? i - 1 : 32; -} -EXPORT_SYMBOL_GPL(rtl8723_phy_calculate_bit_shift); - u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset) { diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h index edf1c52f0ee2..af85c3287507 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h @@ -27,7 +27,6 @@ u32 rtl8723_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); void rtl8723_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, u32 data); -u32 rtl8723_phy_calculate_bit_shift(u32 bitmask); u32 rtl8723_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset); void rtl8723_phy_rf_serial_write(struct ieee80211_hw *hw,