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:   Tue, 13 Apr 2021 17:11:39 +0000
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Hans de Goede <hdegoede@redhat.com>,
        Larry Finger <Larry.Finger@lwfinger.net>
From:   Bryan Brattlof <hello@bryanbrattlof.com>
Cc:     linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org,
        Bryan Brattlof <hello@bryanbrattlof.com>
Reply-To: Bryan Brattlof <hello@bryanbrattlof.com>
Subject: [PATCH] staging: rtl8723bs: remove sdio_drv_priv structure
Message-ID: <20210413171124.174008-1-hello@bryanbrattlof.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The sdio_drv_priv structure is a small wrapper around sdio_driver in
linux/mmc/sdio_func.h with an added drv_registered integer.

drv_registered is never used anywhere in the driver and only assigned to
during the sdio registering and unregistering process. We can safely
remove sdio_drv_priv and use the sdio_driver structure directly.

Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 32 ++++++--------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging=
/rtl8723bs/os_dep/sdio_intf.c
index a8ef95ab14da..816b5bf6e3ed 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -36,17 +36,12 @@ static const struct dev_pm_ops rtw_sdio_pm_ops =3D {
 =09.resume=09=3D rtw_sdio_resume,
 };
=20
-struct sdio_drv_priv {
-=09struct sdio_driver r871xs_drv;
-=09int drv_registered;
-};
-
-static struct sdio_drv_priv sdio_drvpriv =3D {
-=09.r871xs_drv.probe =3D rtw_drv_init,
-=09.r871xs_drv.remove =3D rtw_dev_remove,
-=09.r871xs_drv.name =3D "rtl8723bs",
-=09.r871xs_drv.id_table =3D sdio_ids,
-=09.r871xs_drv.drv =3D {
+static struct sdio_driver rtl8723bs_sdio_driver =3D {
+=09.probe =3D rtw_drv_init,
+=09.remove =3D rtw_dev_remove,
+=09.name =3D "rtl8723bs",
+=09.id_table =3D sdio_ids,
+=09.drv =3D {
 =09=09.pm =3D &rtw_sdio_pm_ops,
 =09}
 };
@@ -498,18 +493,11 @@ static int __init rtw_drv_entry(void)
 =09DBG_871X_LEVEL(_drv_always_, "rtl8723bs BT-Coex version =3D %s\n", BTCO=
EXVERSION);
 #endif /*  BTCOEXVERSION */
=20
-=09sdio_drvpriv.drv_registered =3D true;
=20
-=09ret =3D sdio_register_driver(&sdio_drvpriv.r871xs_drv);
-=09if (ret !=3D 0) {
-=09=09sdio_drvpriv.drv_registered =3D false;
+=09ret =3D sdio_register_driver(&rtl8723bs_sdio_driver);
+=09if (ret !=3D 0)
 =09=09rtw_ndev_notifier_unregister();
-=09=09goto exit;
-=09}
=20
-=09goto exit;
-
-exit:
 =09DBG_871X_LEVEL(_drv_always_, "module init ret =3D%d\n", ret);
 =09return ret;
 }
@@ -518,9 +506,7 @@ static void __exit rtw_drv_halt(void)
 {
 =09DBG_871X_LEVEL(_drv_always_, "module exit start\n");
=20
-=09sdio_drvpriv.drv_registered =3D false;
-
-=09sdio_unregister_driver(&sdio_drvpriv.r871xs_drv);
+=09sdio_unregister_driver(&rtl8723bs_sdio_driver);
=20
 =09rtw_ndev_notifier_unregister();
=20
--=20
2.27.0