Commit 64e8bbbc authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman

staging: r8188eu: remove intf_stop pointer

Remove the intf_stop pointer that points to a media-specific stop
function. The r8188eu driver supports only usb.

For usb drivers, intf_stop points to usb_intf_stop, which is only
two lines long.  We can remove intf_stop and usb_intf_stop and call
the two cancel functions directly.
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230206201800.139195-7-martin@kaiser.cxSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da61c45f
...@@ -171,7 +171,6 @@ struct adapter { ...@@ -171,7 +171,6 @@ struct adapter {
s8 signal_strength; s8 signal_strength;
void *cmdThread; void *cmdThread;
void (*intf_stop)(struct adapter *adapter);
struct net_device *pnetdev; struct net_device *pnetdev;
/* used by rtw_rereg_nd_name related function */ /* used by rtw_rereg_nd_name related function */
......
...@@ -761,8 +761,8 @@ void rtw_ips_dev_unload(struct adapter *padapter) ...@@ -761,8 +761,8 @@ void rtw_ips_dev_unload(struct adapter *padapter)
{ {
rtw_fifo_cleanup(padapter); rtw_fifo_cleanup(padapter);
if (padapter->intf_stop) rtw_read_port_cancel(padapter);
padapter->intf_stop(padapter); rtw_write_port_cancel(padapter);
/* s5. */ /* s5. */
if (!padapter->bSurpriseRemoved) if (!padapter->bSurpriseRemoved)
......
...@@ -152,17 +152,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) ...@@ -152,17 +152,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
} }
static void usb_intf_stop(struct adapter *padapter)
{
/* cancel in irp */
rtw_read_port_cancel(padapter);
/* cancel out irp */
rtw_write_port_cancel(padapter);
/* todo:cancel other irps */
}
static void rtw_dev_unload(struct adapter *padapter) static void rtw_dev_unload(struct adapter *padapter)
{ {
if (padapter->bup) { if (padapter->bup) {
...@@ -170,8 +159,9 @@ static void rtw_dev_unload(struct adapter *padapter) ...@@ -170,8 +159,9 @@ static void rtw_dev_unload(struct adapter *padapter)
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP); rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
/* s3. */ /* s3. */
if (padapter->intf_stop) rtw_read_port_cancel(padapter);
padapter->intf_stop(padapter); rtw_write_port_cancel(padapter);
/* s4. */ /* s4. */
rtw_stop_drv_threads(padapter); rtw_stop_drv_threads(padapter);
...@@ -308,8 +298,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb ...@@ -308,8 +298,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb
SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj)); SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj));
padapter = rtw_netdev_priv(pnetdev); padapter = rtw_netdev_priv(pnetdev);
padapter->intf_stop = &usb_intf_stop;
/* step read_chip_version */ /* step read_chip_version */
rtl8188e_read_chip_version(padapter); rtl8188e_read_chip_version(padapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment