From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-02.mail-europe.com (mail-02.mail-europe.com [51.89.119.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B45A72 for ; Mon, 12 Apr 2021 17:00:14 +0000 (UTC) Date: Mon, 12 Apr 2021 16:43:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bryanbrattlof.com; s=protonmail3; t=1618245812; bh=bur6pDDgjXw6skXkwkUN9ZOYk+3Tg1KFD6dBSPnGAeY=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=l9jOGwG/5CoYVff8V7q5TX8HbZUX+omtZjQwP5pNTKJR2yuiTHx5ZNKnsSnfsXyAV FvGW1jNoSmOlzeSe5V5/IM7rT07luS8vMMauGVYEyFf/inaAISgM2KUEaDQoRXn09O U7EdlDkIOCEMDBYbka33WDTViGCxzdGVtu1VpYXj6GI1D5WmIZuFiRSnKrO0lLjHZK fWuhD8K/R7DfBonjjUKKtFYNi58CguG5wm7AmIfuzNqV2+umb/S23n0+w0E7UrlMK/ mb2bhiO1v9zwf6eNPivufhY8jFqe8lnfiI886yi3HkuSQMXrg8QoBN2FEZkOiZxzPa Uli54d2GOPsWw== To: Greg Kroah-Hartman , Hans de Goede , Larry Finger , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org From: Bryan Brattlof Reply-To: Bryan Brattlof 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> X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch 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 >--- > 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