Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 12 Apr 2021 16:43:31 +0000
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Hans de Goede <hdegoede@redhat.com>,
        Larry Finger <Larry.Finger@lwfinger.net>,
        linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org
From:   Bryan Brattlof <hello@bryanbrattlof.com>
Reply-To: Bryan Brattlof <hello@bryanbrattlof.com>
Subject: NAK: [PATCH] staging: rtl8723bs: remove unnecessary adapter
Message-ID: <20210412163414.5i53wyvguckj5uxz@bryanbrattlof.com>
In-Reply-To: <20210412140054.27629-1-hello@bryanbrattlof.com>
References: <20210412140054.27629-1-hello@bryanbrattlof.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Apr 12, 2021 at 02:01:49PM +0000, Bryan Brattlof wrote:
>
>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>
>---
> drivers/staging/rtl8723bs/include/drv_types.h |  1 -
> 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/stagi=
ng/rtl8723bs/include/drv_types.h
>index cec8d5ac0e2e..35882dc2654e 100644
>--- a/drivers/staging/rtl8723bs/include/drv_types.h
>+++ b/drivers/staging/rtl8723bs/include/drv_types.h
>@@ -269,7 +269,6 @@ struct cam_entry_cache {
> struct dvobj_priv {
> =09/*-------- below is common data --------*/
> =09struct adapter *if1; /* PRIMARY_ADAPTER */
>-=09struct adapter *if2; /* SECONDARY_ADAPTER */
>
> =09s32=09processing_dev_remove;
>
>diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/stagin=
g/rtl8723bs/os_dep/sdio_intf.c
>index 2b61a4bdd8a1..3545cb6ef886 100644
>--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
>+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
>@@ -381,7 +381,7 @@ static int rtw_drv_init(
> =09const struct sdio_device_id *id)
> {
> =09int status =3D _FAIL;
>-=09struct adapter *if1 =3D NULL, *if2 =3D NULL;
>+=09struct adapter *if1 =3D NULL;
> =09struct dvobj_priv *dvobj;
>
> =09dvobj =3D sdio_dvobj_init(func);
>@@ -395,17 +395,15 @@ static int rtw_drv_init(
> =09/* dev_alloc_name && register_netdev */
> =09status =3D rtw_drv_register_netdev(if1);
> =09if (status !=3D _SUCCESS)
>-=09=09goto free_if2;
>+=09=09goto free_if1;
>
> =09if (sdio_alloc_irq(dvobj) !=3D _SUCCESS)
>-=09=09goto free_if2;
>+=09=09goto free_if1;
>
> =09rtw_ndev_notifier_register();
> =09status =3D _SUCCESS;
>
>-free_if2:
>-=09if (status !=3D _SUCCESS && if2) {
>-=09}
>+free_if1:
> =09if (status !=3D _SUCCESS && if1) {
> =09=09rtw_sdio_if1_deinit(if1);
> =09}
>--=20
>2.27.0
>

Nack. There is a merge conflict when updating to next-20210412. I'll=20
resend v2 after I resolve the conflict.

--
~Bryan