From: Michael Straube <straube.linux@gmail.com>
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 <straube.linux@gmail.com>
Subject: [PATCH 02/32] staging: r8188eu: remove ODM_GetMACReg()
Date: Wed, 29 Dec 2021 21:50:38 +0100 [thread overview]
Message-ID: <20211229205108.26373-3-straube.linux@gmail.com> (raw)
In-Reply-To: <20211229205108.26373-1-straube.linux@gmail.com>
ODM_GetMACReg() is just a wrapper around rtl8188e_PHY_QueryBBReg().
Remove ODM_GetMACReg() and call rtl8188e_PHY_QueryBBReg() directly.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm_RTL8188E.c | 8 ++++----
drivers/staging/r8188eu/hal/odm_interface.c | 6 ------
drivers/staging/r8188eu/include/odm_interface.h | 2 --
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
index 2fd7dee2d4b5..67d0009dcbc5 100644
--- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
@@ -9,7 +9,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
u32 value32;
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+ value32 = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
rtl8188e_PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32 | (BIT(23) | BIT(25))); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
ODM_SetBBReg(dm_odm, ODM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);/* Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
@@ -31,7 +31,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
u32 value32;
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+ value32 = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
rtl8188e_PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, value32 | (BIT(23) | BIT(25))); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
/* Pin Settings */
ODM_SetBBReg(dm_odm, ODM_REG_PIN_CTRL_11N, BIT(9) | BIT(8), 0);/* Reg870[8]=1'b0, Reg870[9]=1'b0 antsel antselb by HW */
@@ -62,9 +62,9 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)
u32 value32;
/* MAC Setting */
- value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
+ value32 = rtl8188e_PHY_QueryBBReg(adapter, 0x4c, bMaskDWord);
rtl8188e_PHY_SetBBReg(adapter, 0x4c, bMaskDWord, value32 | (BIT(23) | BIT(25))); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
- value32 = ODM_GetMACReg(dm_odm, 0x7B4, bMaskDWord);
+ value32 = rtl8188e_PHY_QueryBBReg(adapter, 0x7B4, bMaskDWord);
rtl8188e_PHY_SetBBReg(adapter, 0x7b4, bMaskDWord, value32 | (BIT(16) | BIT(17))); /* Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */
/* Match MAC ADDR */
diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index f40adfff7ab6..6c29122553b5 100644
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -4,12 +4,6 @@
#include "../include/odm_precomp.h"
/* ODM IO Relative API. */
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)
-{
- struct adapter *Adapter = pDM_Odm->Adapter;
- return rtl8188e_PHY_QueryBBReg(Adapter, RegAddr, BitMask);
-}
-
void ODM_SetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data)
{
struct adapter *Adapter = pDM_Odm->Adapter;
diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index ab7f263f3f79..b4af86ac5bd4 100644
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -12,8 +12,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext);
/* =========== EXtern Function Prototype */
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
-
void ODM_SetBBReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr,
u32 BitMask, u32 Data);
--
2.34.1
next prev parent reply other threads:[~2021-12-29 20:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-29 20:50 [PATCH 00/32] staging: r8188eu: remove odm_interface and odm_precomp.h Michael Straube
2021-12-29 20:50 ` [PATCH 01/32] staging: r8188eu: remove ODM_SetMACReg() Michael Straube
2021-12-29 20:50 ` Michael Straube [this message]
2021-12-29 20:50 ` [PATCH 03/32] staging: r8188eu: remove ODM_GetRFReg() Michael Straube
2021-12-29 20:50 ` [PATCH 04/32] staging: r8188eu: remove ODM_SetRFReg() Michael Straube
2021-12-29 20:50 ` [PATCH 05/32] staging: r8188eu: remove ODM_GetBBReg() Michael Straube
2021-12-29 20:50 ` [PATCH 06/32] staging: r8188eu: remove ODM_SetBBReg() Michael Straube
2021-12-29 20:50 ` [PATCH 07/32] staging: r8188eu: clean up coding style issues Michael Straube
2021-12-29 20:50 ` [PATCH 08/32] staging: r8188eu: remove ODM_sleep_ms() Michael Straube
2021-12-29 20:50 ` [PATCH 09/32] staging: r8188eu: remove ODM_delay_us() Michael Straube
2021-12-29 20:50 ` [PATCH 10/32] staging: r8188eu: remove ODM_delay_ms() Michael Straube
2021-12-29 20:50 ` [PATCH 11/32] staging: r8188eu: remove ODM_CompareMemory() Michael Straube
2021-12-29 20:50 ` [PATCH 12/32] staging: r8188eu: remove odm_interface Michael Straube
2021-12-29 20:50 ` [PATCH 13/32] staging: r8188eu: make odm_ConfigRFReg_8188E() static Michael Straube
2021-12-29 20:50 ` [PATCH 14/32] staging: r8188eu: remove unused prototypes Michael Straube
2021-12-29 20:50 ` [PATCH 15/32] staging: r8188eu: make odm_DIGInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 16/32] staging: r8188eu: make odm_DIG() static Michael Straube
2021-12-29 20:50 ` [PATCH 17/32] staging: r8188eu: make odm_CommonInfoSelfInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 18/32] staging: r8188eu: make odm_CommonInfoSelfUpdate() static Michael Straube
2021-12-29 20:50 ` [PATCH 19/32] staging: r8188eu: make odm_RateAdaptiveMaskInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 20/32] staging: r8188eu: make odm_RefreshRateAdaptiveMask() static Michael Straube
2022-01-06 12:26 ` Dan Carpenter
2022-01-07 8:48 ` Michael Straube
2021-12-29 20:50 ` [PATCH 21/32] staging: r8188eu: make odm_DynamicBBPowerSavingInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 22/32] staging: r8188eu: make odm_FalseAlarmCounterStatistics() static Michael Straube
2021-12-29 20:50 ` [PATCH 23/32] staging: r8188eu: make odm_CCKPacketDetectionThresh() static Michael Straube
2021-12-29 20:51 ` [PATCH 24/32] staging: r8188eu: make odm_RSSIMonitorCheck() static Michael Straube
2021-12-29 20:51 ` [PATCH 25/32] staging: r8188eu: remove odm_TXPowerTrackingInit() Michael Straube
2021-12-29 20:51 ` [PATCH 26/32] staging: r8188eu: make odm_TXPowerTrackingThermalMeterInit() static Michael Straube
2021-12-29 20:51 ` [PATCH 27/32] staging: r8188eu: make odm_InitHybridAntDiv() static Michael Straube
2021-12-29 20:51 ` [PATCH 28/32] staging: r8188eu: make odm_HwAntDiv() static Michael Straube
2021-12-29 20:51 ` [PATCH 29/32] staging: r8188eu: make ODM_EdcaTurboInit() static Michael Straube
2021-12-29 20:51 ` [PATCH 30/32] staging: r8188eu: make odm_EdcaTurboCheck() static Michael Straube
2021-12-29 20:51 ` [PATCH 31/32] staging: r8188eu: remove unnecessary comments Michael Straube
2021-12-29 20:51 ` [PATCH 32/32] staging: r8188eu: remove header odm_precomp.h Michael Straube
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=20211229205108.26373-3-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome