This series removes two nested wrappers around the function
phy_RF6052_Config_ParaFile().
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (2):
staging: r8188eu: remove PHY_RF6052_Config8188E()
staging: r8188eu: remove PHY_RFConfig8188E()
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 9 ---------
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 13 +------------
drivers/staging/r8188eu/hal/usb_halinit.c | 2 +-
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 1 -
drivers/staging/r8188eu/include/rtl8188e_rf.h | 2 +-
5 files changed, 3 insertions(+), 24 deletions(-)
--
2.37.3
The function PHY_RFConfig8188E() is just a wrapper around
phy_RF6052_Config_ParaFile(). Remove the wrapper.
Signed-off-by: Michael Straube <[email protected]>
---
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 9 ---------
drivers/staging/r8188eu/hal/usb_halinit.c | 2 +-
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 1 -
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index cb2788bc383b..731179635c54 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -507,15 +507,6 @@ PHY_BBConfig8188E(
return rtStatus;
}
-int PHY_RFConfig8188E(struct adapter *Adapter)
-{
- int rtStatus = _SUCCESS;
-
- /* RF config */
- rtStatus = phy_RF6052_Config_ParaFile(Adapter);
- return rtStatus;
-}
-
static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,
u8 *ofdmPowerLevel, u8 *BW20PowerLevel,
u8 *BW40PowerLevel)
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index a478b83dcbf3..d28b4dc2a767 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -611,7 +611,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
if (status == _FAIL)
goto exit;
- status = PHY_RFConfig8188E(Adapter);
+ status = phy_RF6052_Config_ParaFile(Adapter);
if (status == _FAIL)
goto exit;
diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index 9e6f2361b090..4a0b782c33be 100644
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -80,7 +80,6 @@ void rtl8188e_PHY_SetRFReg(struct adapter *adapter, u32 regaddr, u32 mask, u32 d
/* MAC/BB/RF HAL config */
int PHY_MACConfig8188E(struct adapter *adapter);
int PHY_BBConfig8188E(struct adapter *adapter);
-int PHY_RFConfig8188E(struct adapter *adapter);
/* BB TX Power R/W */
void PHY_SetTxPowerLevel8188E(struct adapter *adapter, u8 channel);
--
2.37.3
The function PHY_RF6052_Config8188E() is just a wrapper around
phy_RF6052_Config_ParaFile(). Remove the wrapper.
Signed-off-by: Michael Straube <[email protected]>
---
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +-
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 13 +------------
drivers/staging/r8188eu/include/rtl8188e_rf.h | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index a435ec65d4b1..cb2788bc383b 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -512,7 +512,7 @@ int PHY_RFConfig8188E(struct adapter *Adapter)
int rtStatus = _SUCCESS;
/* RF config */
- rtStatus = PHY_RF6052_Config8188E(Adapter);
+ rtStatus = phy_RF6052_Config_ParaFile(Adapter);
return rtStatus;
}
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
index 237232432f37..0dc902b0abae 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
@@ -366,7 +366,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
}
}
-static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
+int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
{
struct bb_reg_def *pPhyReg;
struct hal_data_8188e *pHalData = &Adapter->haldata;
@@ -404,14 +404,3 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
return rtStatus;
}
-
-int PHY_RF6052_Config8188E(struct adapter *Adapter)
-{
- int rtStatus = _SUCCESS;
-
- /* */
- /* Config BB and RF */
- /* */
- rtStatus = phy_RF6052_Config_ParaFile(Adapter);
- return rtStatus;
-}
diff --git a/drivers/staging/r8188eu/include/rtl8188e_rf.h b/drivers/staging/r8188eu/include/rtl8188e_rf.h
index 04556496baad..63ac0acc68fd 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_rf.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_rf.h
@@ -8,7 +8,7 @@
#define RF6052_MAX_REG 0x3F
#define RF6052_MAX_PATH 2
-int PHY_RF6052_Config8188E(struct adapter *Adapter);
+int phy_RF6052_Config_ParaFile(struct adapter *Adapter);
void rtl8188e_PHY_RF6052SetBandwidth(struct adapter *Adapter,
enum ht_channel_width Bandwidth);
void rtl8188e_PHY_RF6052SetCckTxPower(struct adapter *Adapter, u8 *level);
--
2.37.3
On 9/28/22 10:36, Michael Straube wrote:
> This series removes two nested wrappers around the function
> phy_RF6052_Config_ParaFile().
>
> Tested on x86_64 with Inter-Tech DMG-02.
>
> Michael Straube (2):
> staging: r8188eu: remove PHY_RF6052_Config8188E()
> staging: r8188eu: remove PHY_RFConfig8188E()
>
> drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 9 ---------
> drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 13 +------------
> drivers/staging/r8188eu/hal/usb_halinit.c | 2 +-
> drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 1 -
> drivers/staging/r8188eu/include/rtl8188e_rf.h | 2 +-
> 5 files changed, 3 insertions(+), 24 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]> # Edimax N150