staging: rtl8723bs: hal: Replace function PHY_GetTxPowerIndex()

Remove function PHY_GetTxPowerIndex as it does nothing except call
PHY_GetTxPowerIndex_8723B.
Rename PHY_GetTxPowerIndex_8723B to PHY_GetTxPowerIndex to maintain
compatibility with call site.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190725052645.2372-3-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 7b1e6c4a2e8dd2ac7f5f263dc0a4a261f76d8749..6539bee9b5bafae644abb8ef51561690cd40c2e9 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -2040,17 +2040,6 @@ void PHY_SetTxPowerLimit(
        }
 }
 
-u8 PHY_GetTxPowerIndex(
-       struct adapter *padapter,
-       u8 RFPath,
-       u8 Rate,
-       enum CHANNEL_WIDTH BandWidth,
-       u8 Channel
-)
-{
-       return PHY_GetTxPowerIndex_8723B(padapter, RFPath, Rate, BandWidth, Channel);
-}
-
 void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan)
 {
        struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index b02ff10fedbfaca0aa11f64a46a75713bbd2fb31..cb3ec085faa5b43e925db1a586e9f5c88f15b04c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -668,7 +668,7 @@ void PHY_SetTxPowerIndex(
        }
 }
 
-u8 PHY_GetTxPowerIndex_8723B(
+u8 PHY_GetTxPowerIndex(
        struct adapter *padapter,
        u8 RFPath,
        u8 Rate,

diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index f3521b7ae295c300cd54e3ad27c212b8dd5f0512..9167f1e7827fb276c02de7f67488876f953e176a 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -213,15 +213,6 @@ PHY_GetTxPowerTrackingOffset(
        u8      RFPath
        );
 
-u8
-PHY_GetTxPowerIndex(
-struct adapter *               padapter,
-u8                     RFPath,
-u8                     Rate,
-enum CHANNEL_WIDTH             BandWidth,
-u8                     Channel
-       );
-
 void
 Hal_ChannelPlanToRegulation(
 struct adapter *       Adapter,

diff --git a/drivers/staging/rtl8723bs/include/hal_phy_cfg.h b/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
index 1ebd7094705fc5e15c464573fcdbfe5f163a04ed..b40868b2e76f4d68090c030046e2491fa24865e3 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy_cfg.h
@@ -73,7 +73,7 @@ u8                    Rate
        );
 
 u8
-PHY_GetTxPowerIndex_8723B(
+PHY_GetTxPowerIndex(
 struct adapter *               padapter,
 u8                     RFPath,
 u8                     Rate,