Messages in this thread | | | Date | Thu, 25 Nov 2021 18:43:21 +0100 | Subject | Re: [PATCH 1/4] staging: r8188eu: remove pm_netdev_open | From | 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>
| |