From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA6B52C9E for ; Sun, 5 Dec 2021 17:14:37 +0000 (UTC) Received: by mail-ed1-f42.google.com with SMTP id l25so33340320eda.11 for ; Sun, 05 Dec 2021 09:14:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mbpd+m6t3FhZn6q2UWR6mi6rF/xhaVQT3CnluKIB01M=; b=pNYJ8jUANcxct3F3P/seJ3g4mVOaMk97aDxT+xUwz87QCZXCHBpUoL4NrnZRADfzYa 9hSj6ARGzN6LmfI2UdNU447lpdyTfJpOSGZjoJplYrNU5dMmubgb9zugCJKpY323QFUf Yv6dBjUHnNw0x3AWG7Y25Ayxo/vrc8Jex6Y6Ek3XztF7jOyMwS7Iz+Zeg4GWnsGSLZzA c0AsTVIQaVrhFNozUeZF2ErW2baNBIK/Jl49Q+J/aUH8n4F3GBBz1GGsvkna+vuZA5hE ov8BS6I4NId2qniezNMrRd8Ys8Bv+XnjvPXZaD/n3uhEfEYWEXu/lamrjNbamKoz69ho wiSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mbpd+m6t3FhZn6q2UWR6mi6rF/xhaVQT3CnluKIB01M=; b=7kugULju4tgleavyCcjo9fDECll6rCb7e4JRx2MUp58jHSvYxrFb+KUbcvsG/jlcMY uzTd4CAlA/QlOf6w+XAA50wYarS1ByvEckbzltLvoTLdXl5Mc2awnIndDU/IncQ/0J6G 6shSrjd3nTOVbLBCM8W24XMQR0H96/usSASCoOkuEJD4GkOrMiFt+kP6oB+gj15Ev31G JkRRiJBvDD4JHYcyV4UHw9+BafCtE/DxGdeNyeJpNBRthhv0rWq/IHUAU/Xm/WI9Pig+ tqHdsW/DJm/5Mj9yttkME0DFwHu939kx3HxhsKYV/w+YKQyCp1aANFJv4i9MF6DkBBgl TXUA== X-Gm-Message-State: AOAM532kB8pGqWulY/AVN8e2KcOmEs6/+CiDH+a3rbKmoggprWL9lPXt 6w7T33s4dshSIGhjiX6j/xA= X-Google-Smtp-Source: ABdhPJwvt4VGvmagm51r5gGXw4JCG7shcYdgstxsMQ3tNJgTZy7TfjjJcgejzLwZ5CC2G4/7TZ6z7w== X-Received: by 2002:aa7:cc83:: with SMTP id p3mr47224115edt.382.1638724476217; Sun, 05 Dec 2021 09:14:36 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::b792]) by smtp.gmail.com with ESMTPSA id ch28sm6071773edb.72.2021.12.05.09.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Dec 2021 09:14:35 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 04/10] staging: r8188eu: remove macro PHY_QueryRFReg Date: Sun, 5 Dec 2021 18:13:36 +0100 Message-Id: <20211205171342.20551-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211205171342.20551-1-straube.linux@gmail.com> References: <20211205171342.20551-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The macro PHY_QueryRFReg just re-defines rtl8188e_PHY_QueryRFReg(). Call rtl8188e_PHY_QueryRFReg() directly and remove the macro. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 6 +++--- drivers/staging/r8188eu/hal/odm_interface.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 4 ++-- drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c index 5c82e5f6cebf..701708d01233 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -853,11 +853,11 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) if ((tmpreg & 0x70) != 0) { /* 1. Read original RF mode */ /* Path-A */ - RF_Amode = PHY_QueryRFReg(adapt, RF_PATH_A, RF_AC, bMask12Bits); + RF_Amode = rtl8188e_PHY_QueryRFReg(adapt, RF_PATH_A, RF_AC, bMask12Bits); /* Path-B */ if (is2t) - RF_Bmode = PHY_QueryRFReg(adapt, RF_PATH_B, RF_AC, bMask12Bits); + RF_Bmode = rtl8188e_PHY_QueryRFReg(adapt, RF_PATH_B, RF_AC, bMask12Bits); /* 2. Set RF mode = standby mode */ /* Path-A */ @@ -869,7 +869,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) } /* 3. Read RF reg18 */ - LC_Cal = PHY_QueryRFReg(adapt, RF_PATH_A, RF_CHNLBW, bMask12Bits); + LC_Cal = rtl8188e_PHY_QueryRFReg(adapt, RF_PATH_A, RF_CHNLBW, bMask12Bits); /* 4. Set LC calibration begin bit15 */ ODM_SetRFReg(dm_odm, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal | 0x08000); diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c index b6f55709df9f..df981ca4fb29 100644 --- a/drivers/staging/r8188eu/hal/odm_interface.c +++ b/drivers/staging/r8188eu/hal/odm_interface.c @@ -37,7 +37,7 @@ void ODM_SetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath, u32 u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask) { struct adapter *Adapter = pDM_Odm->Adapter; - return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask); + return rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask); } /* ODM Memory relative API. */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index e995904cf85c..b53392161f09 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -745,8 +745,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ /* Keep RfRegChnlVal for later use. */ - haldata->RfRegChnlVal[0] = PHY_QueryRFReg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask); - haldata->RfRegChnlVal[1] = PHY_QueryRFReg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask); + haldata->RfRegChnlVal[0] = rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask); + haldata->RfRegChnlVal[1] = rtl8188e_PHY_QueryRFReg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK); _BBTurnOnBlock(Adapter); diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h index 467ee48fa49c..a60eb2e39684 100644 --- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h +++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h @@ -138,7 +138,5 @@ void storePwrIndexDiffRateOffset(struct adapter *adapter, u32 regaddr, rtl8188e_PHY_QueryBBReg((adapt), (regaddr), (mask)) #define PHY_SetBBReg(adapt, regaddr, bitmask, data) \ rtl8188e_PHY_SetBBReg((adapt), (regaddr), (bitmask), (data)) -#define PHY_QueryRFReg(adapt, rfpath, regaddr, bitmask) \ - rtl8188e_PHY_QueryRFReg((adapt), (rfpath), (regaddr), (bitmask)) #endif /* __INC_HAL8192CPHYCFG_H */ -- 2.34.1