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>

diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index f1f588d..83d43e5 100644 (file)
--- 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 7090c1b..a9a9631 100644 (file)
--- 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);