From: Uwe Kleine-König Date: Mon, 12 Jan 2026 15:46:58 +0000 (+0100) Subject: wifi: rsi: sdio: Migrate to use sdio specific shutdown function X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f789b37c14ac4f92cc75229b7159a29a747d92a;p=thirdparty%2Fkernel%2Flinux.git wifi: rsi: 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 Link: https://patch.msgid.link/2909323889b8ad4732ef6a8e05b5c40487a6c4bb.1768232321.git.u.kleine-koenig@baylibre.com Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 1e578533e4739..ee7ad81c858df 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1443,9 +1443,8 @@ static int rsi_thaw(struct device *dev) return 0; } -static void rsi_shutdown(struct device *dev) +static void rsi_shutdown(struct sdio_func *pfunction) { - struct sdio_func *pfunction = dev_to_sdio_func(dev); struct rsi_hw *adapter = sdio_get_drvdata(pfunction); struct rsi_91x_sdiodev *sdev = adapter->rsi_dev; struct ieee80211_hw *hw = adapter->hw; @@ -1513,9 +1512,9 @@ static struct sdio_driver rsi_driver = { .remove = rsi_disconnect, .id_table = rsi_dev_table, #ifdef CONFIG_PM + .shutdown = rsi_shutdown, .drv = { .pm = &rsi_pm_ops, - .shutdown = rsi_shutdown, } #endif };