diff options
| author | Bryan Brattlof <hello@bryanbrattlof.com> | 2021-04-12 17:23:08 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-13 09:49:48 +0200 |
| commit | 59bc0e634b2e920067b4a7df3f3a2c5a606455dd (patch) | |
| tree | 1ffab3fe5c418daccb0f719b4baa7095ee642501 /drivers/staging | |
| parent | 1ec0ee058dcb58c4686e6f7f18fdb47d891eea54 (diff) | |
staging: rtl8723bs: remove unnecessary adapter
The if2 adapter is defined in rtw_dvr_init() and in the dvobj_priv
structure but never used anywhere in the driver. This will remove all
definitions of if2
Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/20210412172147.43509-1-hello@bryanbrattlof.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8723bs/include/drv_types.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index f1f588d38a60..83d43e5726dd 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -268,7 +268,6 @@ struct cam_entry_cache { struct dvobj_priv { /*-------- below is common data --------*/ struct adapter *if1; /* PRIMARY_ADAPTER */ - struct adapter *if2; /* SECONDARY_ADAPTER */ s32 processing_dev_remove; diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c index 7090c1b3cc2f..a9a9631dd23c 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -369,7 +369,7 @@ static int rtw_drv_init( const struct sdio_device_id *id) { int status = _FAIL; - struct adapter *if1 = NULL, *if2 = NULL; + struct adapter *if1 = NULL; struct dvobj_priv *dvobj; dvobj = sdio_dvobj_init(func); @@ -383,17 +383,15 @@ static int rtw_drv_init( /* dev_alloc_name && register_netdev */ status = rtw_drv_register_netdev(if1); if (status != _SUCCESS) - goto free_if2; + goto free_if1; if (sdio_alloc_irq(dvobj) != _SUCCESS) - goto free_if2; + goto free_if1; rtw_ndev_notifier_register(); status = _SUCCESS; -free_if2: - if (status != _SUCCESS && if2) { - } +free_if1: if (status != _SUCCESS && if1) rtw_sdio_if1_deinit(if1); |