From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) (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 11B0E72 for ; Tue, 13 Apr 2021 17:11:53 +0000 (UTC) Date: Tue, 13 Apr 2021 17:11:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bryanbrattlof.com; s=protonmail3; t=1618333905; bh=JRgenIaLUI4xNF3fT6/o+CfeGgQ3ycbu2skgPulPjiI=; h=Date:To:From:Cc:Reply-To:Subject:From; b=el1X2abuLZXwA3e5DlDZ4teIaFcaAL7MIJTMwOlKmD9MiVRFaxtH0VvUE/DxjVnb0 wxON/ImnI9/nMl8lDQjVIc7AFD8nQIz2cCh5XgYiGCAlO2rLAewBWHK25fzi5V7cCQ DjQ1AKX44wYKg6CcSSaNixgn7bLYhx+eUH+ctkJ1624VQbzqS1Iy0Ve9Rjzhgq/Rmd ezY96vOYsRTNUquaitSQx5GQLg6AWC8vW38+2J64ELPl3pbEs3OlmII3jgjU1BTM9h zac+ia0bQoPWSS5cK65xlMl1xGF6XIvZl/oAYYLvfuCL7MX556/fOhkuSpd2is8Eq2 Tc4lFeZ577fnQ== To: Greg Kroah-Hartman , Hans de Goede , Larry Finger From: Bryan Brattlof Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Bryan Brattlof Reply-To: Bryan Brattlof Subject: [PATCH] staging: rtl8723bs: remove sdio_drv_priv structure Message-ID: <20210413171124.174008-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 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 --- 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