[PATCH 0/4] staging: r8188eu: some trivial removals

[PATCH 0/4] staging: r8188eu: some trivial removals

[Martin Kaiser]

Remove empty functions and unused function parameters.

Tested on top of "clean up workers". Most likey, there's no conflicts
with my previous patches.

Martin Kaiser (4):
  staging: r8188eu: remove pm_netdev_open
  staging: r8188eu: remove _ps_open_RF
  staging: r8188eu: remove _ps_close_RF
  staging: r8188eu: loadparam needs no net_device

 drivers/staging/r8188eu/hal/usb_halinit.c    | 18 +-----------------
 drivers/staging/r8188eu/include/usb_osintf.h |  1 -
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 15 ++-------------
 drivers/staging/r8188eu/os_dep/usb_intf.c    |  2 +-
 4 files changed, 4 insertions(+), 32 deletions(-)

-- 
2.20.1

[PATCH 1/4] staging: r8188eu: remove pm_netdev_open

[Martin Kaiser]

The only caller of pm_netdev_open sets bnormal to true. In this case,
pm_netdev_open just calls netdev_open.

Remove pm_netdev_open and call netdev_open directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/include/usb_osintf.h |  1 -
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 11 -----------
 drivers/staging/r8188eu/os_dep/usb_intf.c    |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index 624298b4bd0b..3e777ca52745 100644
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -16,7 +16,6 @@ extern int rtw_mc2u_disable;
 u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
 		    enum rt_usb_wvalue wvalue, u8 windex, void *data,
 		    u8 datalen, u8 isdirectionin);
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
 void netdev_br_init(struct net_device *netdev);
 void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
 void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 5a5f182d30c9..397981bc9a62 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -760,17 +760,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 		rtw_hal_deinit(padapter);
 }
 
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
-{
-	int status;
-
-	if (bnormal)
-		status = netdev_open(pnetdev);
-	else
-		status =  (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);
-	return status;
-}
-
 int netdev_close(struct net_device *pnetdev)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index eca1036a721f..984e408f9366 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -298,7 +298,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
 		pwrpriv->bkeepfwalive = false;
 
 	DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
-	if (pm_netdev_open(pnetdev, true) != 0) {
+	if (netdev_open(pnetdev) != 0) {
 		mutex_unlock(&pwrpriv->lock);
 		goto exit;
 	}
-- 
2.20.1

[PATCH 2/4] staging: r8188eu: remove _ps_open_RF

[Martin Kaiser]

The _ps_open_RF function is empty. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/usb_halinit.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 04518e9838ea..995ea4a55435 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -615,8 +615,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
 
 	if (Adapter->pwrctrlpriv.bkeepfwalive) {
-		_ps_open_RF(Adapter);
-
 		if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
 			PHY_IQCalibrate_8188E(Adapter, true);
 		} else {
@@ -852,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	return status;
 }
 
-void _ps_open_RF(struct adapter *adapt)
-{
-	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
-	/* phy_SsPwrSwitch92CU(adapt, rf_on, 1); */
-}
-
 static void _ps_close_RF(struct adapter *adapt)
 {
 	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
-- 
2.20.1

[PATCH 3/4] staging: r8188eu: remove _ps_close_RF

[Martin Kaiser]

The _ps_close_RF is empty. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/usb_halinit.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 995ea4a55435..0b1aaa162c21 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -850,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	return status;
 }
 
-static void _ps_close_RF(struct adapter *adapt)
-{
-	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
-	/* phy_SsPwrSwitch92CU(adapt, rf_off, 1); */
-}
-
 static void CardDisableRTL8188EU(struct adapter *Adapter)
 {
 	u8 val8;
@@ -921,9 +915,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
 	rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E);
 
 	DBG_88E("bkeepfwalive(%x)\n", Adapter->pwrctrlpriv.bkeepfwalive);
-	if (Adapter->pwrctrlpriv.bkeepfwalive) {
-		_ps_close_RF(Adapter);
-	} else {
+	if (!Adapter->pwrctrlpriv.bkeepfwalive) {
 		if (Adapter->hw_init_completed) {
 			CardDisableRTL8188EU(Adapter);
 		}
-- 
2.20.1

[PATCH 4/4] staging: r8188eu: loadparam needs no net_device

[Martin Kaiser]

Remove the second parameter of the loadparam function. This parameter
is not used.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 397981bc9a62..02700834c587 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -153,7 +153,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
 module_param_named(debug, rtw_debug, int, 0444);
 MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
 
-static uint loadparam(struct adapter *padapter,  struct  net_device *pnetdev)
+static uint loadparam(struct adapter *padapter)
 {
 	struct registry_priv  *registry_par = &padapter->registrypriv;
 
@@ -371,7 +371,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
 	pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
 
 	/* step 2. */
-	loadparam(padapter, pnetdev);
+	loadparam(padapter);
 
 	return pnetdev;
 }
-- 
2.20.1

Re: [PATCH 1/4] staging: r8188eu: remove pm_netdev_open

[Michael Straube]

On 11/25/21 17:47, Martin Kaiser wrote:
> The only caller of pm_netdev_open sets bnormal to true. In this case,
> pm_netdev_open just calls netdev_open.
> 
> Remove pm_netdev_open and call netdev_open directly.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>   drivers/staging/r8188eu/include/usb_osintf.h |  1 -
>   drivers/staging/r8188eu/os_dep/os_intfs.c    | 11 -----------
>   drivers/staging/r8188eu/os_dep/usb_intf.c    |  2 +-
>   3 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
> index 624298b4bd0b..3e777ca52745 100644
> --- a/drivers/staging/r8188eu/include/usb_osintf.h
> +++ b/drivers/staging/r8188eu/include/usb_osintf.h
> @@ -16,7 +16,6 @@ extern int rtw_mc2u_disable;
>   u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
>   		    enum rt_usb_wvalue wvalue, u8 windex, void *data,
>   		    u8 datalen, u8 isdirectionin);
> -int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
>   void netdev_br_init(struct net_device *netdev);
>   void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
>   void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
> diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
> index 5a5f182d30c9..397981bc9a62 100644
> --- a/drivers/staging/r8188eu/os_dep/os_intfs.c
> +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
> @@ -760,17 +760,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
>   		rtw_hal_deinit(padapter);
>   }
>   
> -int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
> -{
> -	int status;
> -
> -	if (bnormal)
> -		status = netdev_open(pnetdev);
> -	else
> -		status =  (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);
> -	return status;
> -}
> -
>   int netdev_close(struct net_device *pnetdev)
>   {
>   	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
> diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
> index eca1036a721f..984e408f9366 100644
> --- a/drivers/staging/r8188eu/os_dep/usb_intf.c
> +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
> @@ -298,7 +298,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
>   		pwrpriv->bkeepfwalive = false;
>   
>   	DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
> -	if (pm_netdev_open(pnetdev, true) != 0) {
> +	if (netdev_open(pnetdev) != 0) {
>   		mutex_unlock(&pwrpriv->lock);
>   		goto exit;
>   	}
> 

Reviewed-by: Michael Straube <straube.linux@gmail.com>

Re: [PATCH 2/4] staging: r8188eu: remove _ps_open_RF

[Michael Straube]

On 11/25/21 17:47, Martin Kaiser wrote:
> The _ps_open_RF function is empty. Remove it.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>   drivers/staging/r8188eu/hal/usb_halinit.c | 8 --------
>   1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
> index 04518e9838ea..995ea4a55435 100644
> --- a/drivers/staging/r8188eu/hal/usb_halinit.c
> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
> @@ -615,8 +615,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
>   	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
>   
>   	if (Adapter->pwrctrlpriv.bkeepfwalive) {
> -		_ps_open_RF(Adapter);
> -
>   		if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
>   			PHY_IQCalibrate_8188E(Adapter, true);
>   		} else {
> @@ -852,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
>   	return status;
>   }
>   
> -void _ps_open_RF(struct adapter *adapt)
> -{
> -	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
> -	/* phy_SsPwrSwitch92CU(adapt, rf_on, 1); */
> -}
> -
>   static void _ps_close_RF(struct adapter *adapt)
>   {
>   	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
> 

Hi Martin,

The prototype of _ps_open_RF() should also be removed from
rtl8188e_hal.h.

Thanks,
Michael

Re: [PATCH 3/4] staging: r8188eu: remove _ps_close_RF

[Michael Straube]

On 11/25/21 17:47, Martin Kaiser wrote:
> The _ps_close_RF is empty. Remove it.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>   drivers/staging/r8188eu/hal/usb_halinit.c | 10 +---------
>   1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
> index 995ea4a55435..0b1aaa162c21 100644
> --- a/drivers/staging/r8188eu/hal/usb_halinit.c
> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
> @@ -850,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
>   	return status;
>   }
>   
> -static void _ps_close_RF(struct adapter *adapt)
> -{
> -	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
> -	/* phy_SsPwrSwitch92CU(adapt, rf_off, 1); */
> -}
> -
>   static void CardDisableRTL8188EU(struct adapter *Adapter)
>   {
>   	u8 val8;
> @@ -921,9 +915,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
>   	rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E);
>   
>   	DBG_88E("bkeepfwalive(%x)\n", Adapter->pwrctrlpriv.bkeepfwalive);
> -	if (Adapter->pwrctrlpriv.bkeepfwalive) {
> -		_ps_close_RF(Adapter);
> -	} else {
> +	if (!Adapter->pwrctrlpriv.bkeepfwalive) {
>   		if (Adapter->hw_init_completed) {
>   			CardDisableRTL8188EU(Adapter);
>   		}
> 

Reviewed-by: Michael Straube <straube.linux@gmail.com>

Re: [PATCH 4/4] staging: r8188eu: loadparam needs no net_device

[Michael Straube]

On 11/25/21 17:47, Martin Kaiser wrote:
> Remove the second parameter of the loadparam function. This parameter
> is not used.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
>   drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
> index 397981bc9a62..02700834c587 100644
> --- a/drivers/staging/r8188eu/os_dep/os_intfs.c
> +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
> @@ -153,7 +153,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
>   module_param_named(debug, rtw_debug, int, 0444);
>   MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
>   
> -static uint loadparam(struct adapter *padapter,  struct  net_device *pnetdev)
> +static uint loadparam(struct adapter *padapter)
>   {
>   	struct registry_priv  *registry_par = &padapter->registrypriv;
>   
> @@ -371,7 +371,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
>   	pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
>   
>   	/* step 2. */
> -	loadparam(padapter, pnetdev);
> +	loadparam(padapter);
>   
>   	return pnetdev;
>   }
> 

Reviewed-by: Michael Straube <straube.linux@gmail.com>

[PATCH v2 0/4] staging: r8188eu: some trivial removals

[Martin Kaiser]

Remove empty functions and unused function parameters.

Tested on top of "clean up workers". Most likey, there's no conflicts
with my previous patches.

v2:
 - add Michael's Reviewed-by tags
 - remove _ps_open_RF prototype

Martin Kaiser (4):
  staging: r8188eu: remove pm_netdev_open
  staging: r8188eu: remove _ps_open_RF
  staging: r8188eu: remove _ps_close_RF
  staging: r8188eu: loadparam needs no net_device

 drivers/staging/r8188eu/hal/usb_halinit.c      | 18 +-----------------
 drivers/staging/r8188eu/include/rtl8188e_hal.h |  1 -
 drivers/staging/r8188eu/include/usb_osintf.h   |  1 -
 drivers/staging/r8188eu/os_dep/os_intfs.c      | 15 ++-------------
 drivers/staging/r8188eu/os_dep/usb_intf.c      |  2 +-
 5 files changed, 4 insertions(+), 33 deletions(-)

-- 
2.20.1

[PATCH v2 1/4] staging: r8188eu: remove pm_netdev_open

[Martin Kaiser]

The only caller of pm_netdev_open sets bnormal to true. In this case,
pm_netdev_open just calls netdev_open.

Remove pm_netdev_open and call netdev_open directly.

Reviewed-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
v2:
 - add Reviewed-by

 drivers/staging/r8188eu/include/usb_osintf.h |  1 -
 drivers/staging/r8188eu/os_dep/os_intfs.c    | 11 -----------
 drivers/staging/r8188eu/os_dep/usb_intf.c    |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index 624298b4bd0b..3e777ca52745 100644
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -16,7 +16,6 @@ extern int rtw_mc2u_disable;
 u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
 		    enum rt_usb_wvalue wvalue, u8 windex, void *data,
 		    u8 datalen, u8 isdirectionin);
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
 void netdev_br_init(struct net_device *netdev);
 void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
 void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 5a5f182d30c9..397981bc9a62 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -760,17 +760,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 		rtw_hal_deinit(padapter);
 }
 
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
-{
-	int status;
-
-	if (bnormal)
-		status = netdev_open(pnetdev);
-	else
-		status =  (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);
-	return status;
-}
-
 int netdev_close(struct net_device *pnetdev)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index ba74cfc9a523..e66046c82973 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -297,7 +297,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
 		pwrpriv->bkeepfwalive = false;
 
 	DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
-	if (pm_netdev_open(pnetdev, true) != 0) {
+	if (netdev_open(pnetdev) != 0) {
 		mutex_unlock(&pwrpriv->lock);
 		goto exit;
 	}
-- 
2.20.1

[PATCH v2 2/4] staging: r8188eu: remove _ps_open_RF

[Martin Kaiser]

The _ps_open_RF function is empty. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
v2:
 - remove _ps_open_RF prototype

 drivers/staging/r8188eu/hal/usb_halinit.c      | 8 --------
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 04518e9838ea..995ea4a55435 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -615,8 +615,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
 
 	if (Adapter->pwrctrlpriv.bkeepfwalive) {
-		_ps_open_RF(Adapter);
-
 		if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
 			PHY_IQCalibrate_8188E(Adapter, true);
 		} else {
@@ -852,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	return status;
 }
 
-void _ps_open_RF(struct adapter *adapt)
-{
-	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
-	/* phy_SsPwrSwitch92CU(adapt, rf_on, 1); */
-}
-
 static void _ps_close_RF(struct adapter *adapt)
 {
 	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 5848f1d4191a..176b82219459 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -331,6 +331,5 @@ void rtl8188e_read_chip_version(struct adapter *padapter);
 
 s32 rtl8188e_iol_efuse_patch(struct adapter *padapter);
 void rtw_cancel_all_timer(struct adapter *padapter);
-void _ps_open_RF(struct adapter *adapt);
 
 #endif /* __RTL8188E_HAL_H__ */
-- 
2.20.1

[PATCH v2 3/4] staging: r8188eu: remove _ps_close_RF

[Martin Kaiser]

The _ps_close_RF is empty. Remove it.

Reviewed-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
v2:
 - add Reviewed-by

 drivers/staging/r8188eu/hal/usb_halinit.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 995ea4a55435..0b1aaa162c21 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -850,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
 	return status;
 }
 
-static void _ps_close_RF(struct adapter *adapt)
-{
-	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
-	/* phy_SsPwrSwitch92CU(adapt, rf_off, 1); */
-}
-
 static void CardDisableRTL8188EU(struct adapter *Adapter)
 {
 	u8 val8;
@@ -921,9 +915,7 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
 	rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E);
 
 	DBG_88E("bkeepfwalive(%x)\n", Adapter->pwrctrlpriv.bkeepfwalive);
-	if (Adapter->pwrctrlpriv.bkeepfwalive) {
-		_ps_close_RF(Adapter);
-	} else {
+	if (!Adapter->pwrctrlpriv.bkeepfwalive) {
 		if (Adapter->hw_init_completed) {
 			CardDisableRTL8188EU(Adapter);
 		}
-- 
2.20.1

[PATCH v2 4/4] staging: r8188eu: loadparam needs no net_device

[Martin Kaiser]

Remove the second parameter of the loadparam function. This parameter
is not used.

Reviewed-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
v2:
 - add Reviewed-by

 drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 397981bc9a62..02700834c587 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -153,7 +153,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
 module_param_named(debug, rtw_debug, int, 0444);
 MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
 
-static uint loadparam(struct adapter *padapter,  struct  net_device *pnetdev)
+static uint loadparam(struct adapter *padapter)
 {
 	struct registry_priv  *registry_par = &padapter->registrypriv;
 
@@ -371,7 +371,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
 	pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
 
 	/* step 2. */
-	loadparam(padapter, pnetdev);
+	loadparam(padapter);
 
 	return pnetdev;
 }
-- 
2.20.1

Re: [PATCH v2 2/4] staging: r8188eu: remove _ps_open_RF

[Michael Straube]

On 11/26/21 14:03, Martin Kaiser wrote:
> The _ps_open_RF function is empty. Remove it.
> 
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> v2:
>   - remove _ps_open_RF prototype
> 
>   drivers/staging/r8188eu/hal/usb_halinit.c      | 8 --------
>   drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
>   2 files changed, 9 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
> index 04518e9838ea..995ea4a55435 100644
> --- a/drivers/staging/r8188eu/hal/usb_halinit.c
> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
> @@ -615,8 +615,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
>   	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
>   
>   	if (Adapter->pwrctrlpriv.bkeepfwalive) {
> -		_ps_open_RF(Adapter);
> -
>   		if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
>   			PHY_IQCalibrate_8188E(Adapter, true);
>   		} else {
> @@ -852,12 +850,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
>   	return status;
>   }
>   
> -void _ps_open_RF(struct adapter *adapt)
> -{
> -	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
> -	/* phy_SsPwrSwitch92CU(adapt, rf_on, 1); */
> -}
> -
>   static void _ps_close_RF(struct adapter *adapt)
>   {
>   	/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
> diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
> index 5848f1d4191a..176b82219459 100644
> --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
> +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
> @@ -331,6 +331,5 @@ void rtl8188e_read_chip_version(struct adapter *padapter);
>   
>   s32 rtl8188e_iol_efuse_patch(struct adapter *padapter);
>   void rtw_cancel_all_timer(struct adapter *padapter);
> -void _ps_open_RF(struct adapter *adapt);
>   
>   #endif /* __RTL8188E_HAL_H__ */
> 

Reviewed-by: Michael Straube <straube.linux@gmail.com>