From: Bryan Brattlof <hello@bryanbrattlof.com>
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
Subject: NAK: [PATCH] staging: rtl8723bs: remove unnecessary adapter
Date: Mon, 12 Apr 2021 16:43:31 +0000 [thread overview]
Message-ID: <20210412163414.5i53wyvguckj5uxz@bryanbrattlof.com> (raw)
In-Reply-To: <20210412140054.27629-1-hello@bryanbrattlof.com>
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/staging/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 {
> /*-------- 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 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(
> 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);
>@@ -395,17 +395,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);
> }
>--
>2.27.0
>
Nack. There is a merge conflict when updating to next-20210412. I'll
resend v2 after I resolve the conflict.
--
~Bryan
prev parent reply other threads:[~2021-04-12 16:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 14:01 [PATCH] staging: rtl8723bs: remove unnecessary adapter Bryan Brattlof
2021-04-12 16:43 ` Bryan Brattlof [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412163414.5i53wyvguckj5uxz@bryanbrattlof.com \
--to=hello@bryanbrattlof.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).