diff options
| author | Martin Kaiser <[email protected]> | 2022-02-06 17:18:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2022-02-08 10:29:02 +0100 |
| commit | de424be4e976a43d89c04f2fbc6530ea3bf28df8 (patch) | |
| tree | d173e191cfecffda2e07384b9f079a23747a9903 | |
| parent | 3c4b62e3819c552c03a269d18126f0603bc62e85 (diff) | |
staging: r8188eu: remove the global DriverState
DriverState in struct adapter is never set. It remains 0 (DRIVER_NORMAL)
all the time, DriverState != DRIVER_DISAPPEAR is always true.
Both DriverState and the check can be removed. enum driver_state contains
the possible values of DriverState. This enum can be removed as well.
Signed-off-by: Martin Kaiser <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/r8188eu/include/drv_types.h | 8 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/usb_intf.c | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index a07bcf0b6358..1260cacbae64 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -159,15 +159,7 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) return &dvobj->pusbintf->dev; }; -enum driver_state { - DRIVER_NORMAL = 0, - DRIVER_DISAPPEAR = 1, - DRIVER_REPLACE_DONGLE = 2, -}; - struct adapter { - int DriverState;/* for disable driver using module, use dongle toi - * replace module. */ int pid[3];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */ int bDongle;/* build-in module or external dongle */ diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 1a67486ff5fb..b20d0eca12fa 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -454,11 +454,9 @@ static void rtw_usb_if1_deinit(struct adapter *if1) free_mlme_ap_info(if1); - if (if1->DriverState != DRIVER_DISAPPEAR) { - if (pnetdev) { - /* will call netdev_close() */ - unregister_netdev(pnetdev); - } + if (pnetdev) { + /* will call netdev_close() */ + unregister_netdev(pnetdev); } rtw_cancel_all_timer(if1); |