wifi: rtw88: sdio: Migrate to use sdio specific shutdown function

This saves a cast in the driver. The motivation is stop using the callback
.shutdown in rsi_driver.drv to make it possible to drop that.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/5a328658c20613068bbbfabd3d0e721b69b3d474.1768232321.git.u.kleine-koenig@baylibre.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c b/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
index 1f98d35a8dd11f1e8be9b363aa80506475016f03..2018c9d76dd13d9841009dcb17ac73567ecf6db7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723cs.c
@@ -23,9 +23,9 @@ static struct sdio_driver rtw_8723cs_driver = {
        .id_table = rtw_8723cs_id_table,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
+       .shutdown = rtw_sdio_shutdown,
        .drv = {
                .pm = &rtw_sdio_pm_ops,
-               .shutdown = rtw_sdio_shutdown
        }};
 module_sdio_driver(rtw_8723cs_driver);
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
index 206b77e5b98e47ff335c186bf249202ba29c1e18..e38c90b769a28e84ccf6241e9dc17a3a05ca5e13 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
@@ -28,10 +28,10 @@ static struct sdio_driver rtw_8723ds_driver = {
        .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
+       .shutdown = rtw_sdio_shutdown,
        .id_table = rtw_8723ds_id_table,
        .drv = {
                .pm = &rtw_sdio_pm_ops,
-               .shutdown = rtw_sdio_shutdown,
        }
 };
 module_sdio_driver(rtw_8723ds_driver);

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
index 6d94162213c6bc230765ead60dc17a91cecfd2ca..58e0ef219cdcce57bff537ce4f20baa7842d7589 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c
@@ -23,10 +23,10 @@ static struct sdio_driver rtw_8821cs_driver = {
        .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
+       .shutdown = rtw_sdio_shutdown,
        .id_table = rtw_8821cs_id_table,
        .drv = {
                .pm = &rtw_sdio_pm_ops,
-               .shutdown = rtw_sdio_shutdown,
        }
 };
 module_sdio_driver(rtw_8821cs_driver);

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
index 744781dcb419442a96586f91562255852043a9a2..2de9b11540c52218def84b1f93db80e50f4c49cb 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c
@@ -23,10 +23,10 @@ static struct sdio_driver rtw_8822bs_driver = {
        .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
+       .shutdown = rtw_sdio_shutdown,
        .id_table = rtw_8822bs_id_table,
        .drv = {
                .pm = &rtw_sdio_pm_ops,
-               .shutdown = rtw_sdio_shutdown,
        }
 };
 module_sdio_driver(rtw_8822bs_driver);

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
index 322281e07eb8c35aea8ec8bff863075453e2d138..b00ef4173962180763b73da220d010fc9f4cff02 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c
@@ -23,10 +23,10 @@ static struct sdio_driver rtw_8822cs_driver = {
        .name = KBUILD_MODNAME,
        .probe = rtw_sdio_probe,
        .remove = rtw_sdio_remove,
+       .shutdown = rtw_sdio_shutdown,
        .id_table = rtw_8822cs_id_table,
        .drv = {
                .pm = &rtw_sdio_pm_ops,
-               .shutdown = rtw_sdio_shutdown,
        }
 };
 module_sdio_driver(rtw_8822cs_driver);

diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
index e35de52d8eb430e4b1c92ef4e34e7e61f40be3fe..138e9e348c6cfaf4f2fda87f2bece837fc47c749 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/sdio.c
+++ b/drivers/net/wireless/realtek/rtw88/sdio.c
@@ -1414,9 +1414,8 @@ void rtw_sdio_remove(struct sdio_func *sdio_func)
 }
 EXPORT_SYMBOL(rtw_sdio_remove);
 
-void rtw_sdio_shutdown(struct device *dev)
+void rtw_sdio_shutdown(struct sdio_func *sdio_func)
 {
-       struct sdio_func *sdio_func = dev_to_sdio_func(dev);
        const struct rtw_chip_info *chip;
        struct ieee80211_hw *hw;
        struct rtw_dev *rtwdev;

diff --git a/drivers/net/wireless/realtek/rtw88/sdio.h b/drivers/net/wireless/realtek/rtw88/sdio.h
index 3c659ed180f0080d3483be68ba7ba7064d58e02d..457e8b02380e5b63ffac2debcdfe95753dd1d389 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/sdio.h
+++ b/drivers/net/wireless/realtek/rtw88/sdio.h
@@ -166,7 +166,7 @@ extern const struct dev_pm_ops rtw_sdio_pm_ops;
 int rtw_sdio_probe(struct sdio_func *sdio_func,
                   const struct sdio_device_id *id);
 void rtw_sdio_remove(struct sdio_func *sdio_func);
-void rtw_sdio_shutdown(struct device *dev);
+void rtw_sdio_shutdown(struct sdio_func *sdio_func);
 
 static inline bool rtw_sdio_is_sdio30_supported(struct rtw_dev *rtwdev)
 {