Re: [PATCH v3 2/2] staging: r8188eu: remove rtw_hw_resume

Michael Straube
2021-09-18T15:16:42Z

On 9/18/21 15:57, Martin Kaiser wrote:
> Commit c0a099b7341c ("staging: r8188eu: bHWPwrPindetect is always false")
> removed the only call to rtw_hw_resume.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> v3:
> - another rebase against today's staging-testing branch
>
> v2:
> - rebased against today's staging-testing branch
>
> drivers/staging/r8188eu/include/osdep_intf.h | 1 -
> drivers/staging/r8188eu/os_dep/usb_intf.c | 39 --------------------
> 2 files changed, 40 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/osdep_intf.h b/drivers/staging/r8188eu/include/osdep_intf.h
> index 5a2c7a98f023..da36770852f8 100644
> --- a/drivers/staging/r8188eu/include/osdep_intf.h
> +++ b/drivers/staging/r8188eu/include/osdep_intf.h
> @@ -58,6 +58,5 @@ void rtw_ips_dev_unload(struct adapter *padapter);
>
> int rtw_ips_pwr_up(struct adapter *padapter);
> void rtw_ips_pwr_down(struct adapter *padapter);
> -int rtw_hw_resume(struct adapter *padapter);
>
> #endif /* _OSDEP_INTF_H_ */
> diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
> index 25dc90847380..11a584cbe9d8 100644
> --- a/drivers/staging/r8188eu/os_dep/usb_intf.c
> +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
> @@ -278,45 +278,6 @@ static void process_spec_devid(const struct usb_device_id *pdid)
> }
> }
>
> -int rtw_hw_resume(struct adapter *padapter)
> -{
> - struct pwrctrl_priv *pwrpriv;
> - struct net_device *pnetdev = padapter->pnetdev;
> -
> - if (!padapter)
> - goto error_exit;
> - pwrpriv = &padapter->pwrctrlpriv;
> - DBG_88E("==> rtw_hw_resume\n");
> - _enter_pwrlock(&pwrpriv->lock);
> - pwrpriv->bips_processing = true;
> - rtw_reset_drv_sw(padapter);
> -
> - if (pm_netdev_open(pnetdev, false) != 0) {
> - _exit_pwrlock(&pwrpriv->lock);
> - goto error_exit;
> - }
> -
> - netif_device_attach(pnetdev);
> - netif_carrier_on(pnetdev);
> -
> - if (!netif_queue_stopped(pnetdev))
> - netif_start_queue(pnetdev);
> - else
> - netif_wake_queue(pnetdev);
> -
> - pwrpriv->bkeepfwalive = false;
> -
> - pwrpriv->rf_pwrstate = rf_on;
> - pwrpriv->bips_processing = false;
> -
> - _exit_pwrlock(&pwrpriv->lock);
> -
> - return 0;
> -error_exit:
> - DBG_88E("%s, Open net dev failed\n", __func__);
> - return -1;
> -}
> -
> static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
> {
> struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
>

Looks good to me.

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

Thanks,
Michael