Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723bs: remove sdio_drv_priv structure

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>
Link: https://lore.kernel.org/r/20210414173751.317762-1-hello@bryanbrattlof.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bryan Brattlof and committed by
Greg Kroah-Hartman
027ffa10 467d9842

+9 -19
+9 -19
drivers/staging/rtl8723bs/os_dep/sdio_intf.c
··· 36 36 .resume = rtw_sdio_resume, 37 37 }; 38 38 39 - struct sdio_drv_priv { 40 - struct sdio_driver r871xs_drv; 41 - int drv_registered; 42 - }; 43 - 44 - static struct sdio_drv_priv sdio_drvpriv = { 45 - .r871xs_drv.probe = rtw_drv_init, 46 - .r871xs_drv.remove = rtw_dev_remove, 47 - .r871xs_drv.name = "rtl8723bs", 48 - .r871xs_drv.id_table = sdio_ids, 49 - .r871xs_drv.drv = { 39 + static struct sdio_driver rtl8723bs_sdio_driver = { 40 + .probe = rtw_drv_init, 41 + .remove = rtw_dev_remove, 42 + .name = "rtl8723bs", 43 + .id_table = sdio_ids, 44 + .drv = { 50 45 .pm = &rtw_sdio_pm_ops, 51 46 } 52 47 }; ··· 490 495 DBG_871X_LEVEL(_drv_always_, "rtl8723bs BT-Coex version = %s\n", BTCOEXVERSION); 491 496 #endif /* BTCOEXVERSION */ 492 497 493 - sdio_drvpriv.drv_registered = true; 494 498 495 - ret = sdio_register_driver(&sdio_drvpriv.r871xs_drv); 496 - if (ret != 0) { 497 - sdio_drvpriv.drv_registered = false; 499 + ret = sdio_register_driver(&rtl8723bs_sdio_driver); 500 + if (ret != 0) 498 501 rtw_ndev_notifier_unregister(); 499 - } 500 502 501 503 DBG_871X_LEVEL(_drv_always_, "module init ret =%d\n", ret); 502 504 return ret; ··· 503 511 { 504 512 DBG_871X_LEVEL(_drv_always_, "module exit start\n"); 505 513 506 - sdio_drvpriv.drv_registered = false; 507 - 508 - sdio_unregister_driver(&sdio_drvpriv.r871xs_drv); 514 + sdio_unregister_driver(&rtl8723bs_sdio_driver); 509 515 510 516 rtw_ndev_notifier_unregister(); 511 517