staging: rtl8192e: remove unnecessary wrapper

[PATCH] staging: rtl8192e: remove unnecessary wrapper

Posted by Michael Straube 1 year, 10 months ago

_rtl92e_dm_ctrl_initgain_byrssi() is just a wrapper around
_rtl92e_dm_ctrl_initgain_byrssi_driver(). Using a wrapper here adds
no value, remove it. Keep the name _rtl92e_dm_ctrl_initgain_byrssi().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
Compile-tested only.

 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 4c67bfe0e8ec..aebe67f1a46d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -163,7 +163,6 @@ static	void	_rtl92e_dm_check_tx_power_tracking(struct net_device *dev);
 
 static void _rtl92e_dm_dig_init(struct net_device *dev);
 static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev);
-static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev);
 static void _rtl92e_dm_initial_gain(struct net_device *dev);
 static void _rtl92e_dm_pd_th(struct net_device *dev);
 static void _rtl92e_dm_cs_ratio(struct net_device *dev);
@@ -929,11 +928,6 @@ static void _rtl92e_dm_dig_init(struct net_device *dev)
 		dm_digtable.rx_gain_range_min = DM_DIG_MIN;
 }
 
-static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
-{
-	_rtl92e_dm_ctrl_initgain_byrssi_driver(dev);
-}
-
 /*-----------------------------------------------------------------------------
  * Function:	dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm()
  *
@@ -952,7 +946,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
  *
  ******************************************************************************/
 
-static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev)
+static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
 	u8 i;
-- 
2.44.0

Re: [PATCH] staging: rtl8192e: remove unnecessary wrapper

Posted by Philipp Hortmann 1 year, 10 months ago

On 3/29/24 12:14, Michael Straube wrote:
> _rtl92e_dm_ctrl_initgain_byrssi() is just a wrapper around
> _rtl92e_dm_ctrl_initgain_byrssi_driver(). Using a wrapper here adds
> no value, remove it. Keep the name _rtl92e_dm_ctrl_initgain_byrssi().
> 
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> Compile-tested only.
> 
>   drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> index 4c67bfe0e8ec..aebe67f1a46d 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> @@ -163,7 +163,6 @@ static	void	_rtl92e_dm_check_tx_power_tracking(struct net_device *dev);
>   
>   static void _rtl92e_dm_dig_init(struct net_device *dev);
>   static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev);
> -static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev);
>   static void _rtl92e_dm_initial_gain(struct net_device *dev);
>   static void _rtl92e_dm_pd_th(struct net_device *dev);
>   static void _rtl92e_dm_cs_ratio(struct net_device *dev);
> @@ -929,11 +928,6 @@ static void _rtl92e_dm_dig_init(struct net_device *dev)
>   		dm_digtable.rx_gain_range_min = DM_DIG_MIN;
>   }
>   
> -static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
> -{
> -	_rtl92e_dm_ctrl_initgain_byrssi_driver(dev);
> -}
> -
>   /*-----------------------------------------------------------------------------
>    * Function:	dm_CtrlInitGainBeforeConnectByRssiAndFalseAlarm()
>    *
> @@ -952,7 +946,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
>    *
>    ******************************************************************************/
>   
> -static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev)
> +static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev)
>   {
>   	struct r8192_priv *priv = rtllib_priv(dev);
>   	u8 i;

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>