staging: rtl8723bs: remove unnecessary adapter
Subsystems (2)
PATCH v2 1/1 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
--- drivers/staging/rtl8723bs/include/drv_types.h | 1 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/include/drv_types.h +0 -1
@@ -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;
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +4 -6
@@ -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);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerQuoted 9 lines · Bryan Brattlof
The if2 adapter is defined in
rtw_dvr_init()and in thedvobj_privstructure but never used anywhere in the driver. This will remove all definitions of if2Signed-off-by Bryan Brattlof <[email protected]>--- drivers/staging/rtl8723bs/include/drv_types.h | 1 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-)
What changed from v1? That goes below the --- line.
v3?
Quoted 12 lines · Greg Kroah-Hartman
Quoted 9 lines · Bryan Brattlof
The if2 adapter is defined in
rtw_dvr_init()and in thedvobj_privstructure but never used anywhere in the driver. This will remove all definitions of if2Signed-off-by Bryan Brattlof <[email protected]>--- drivers/staging/rtl8723bs/include/drv_types.h | 1 - drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-)
Quoted 3 lines
What changed from v1? That goes below the --- line.
v3?
Oops.
it's the simple things that always seem to be the hardest :)
During the rebase to next-20210412, I lost the bracket on the conditional statement:
394: +free_if1:
395: if (status != _SUCCESS && if1) {
^I'll be sending v3 shortly with a proper change long :) --
~Bryan