Commit f0092801 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Kalle Valo

wifi: wlcore: Convert to platform remove callback returning void

The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code.  However the value returned is (mostly) ignored
and this typically results in resource leaks. To improve here there is a
quest to make the remove callback return void. In the first step of this
quest all drivers are converted to .remove_new() which already returns
void.

wlcore_remove() returned zero unconditionally. With that converted to
return void instead, the wl12xx and wl18xx driver can be converted to
.remove_new trivially.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230912171249.755901-1-u.kleine-koenig@pengutronix.de
parent c3564280
...@@ -1919,7 +1919,7 @@ static int wl12xx_probe(struct platform_device *pdev) ...@@ -1919,7 +1919,7 @@ static int wl12xx_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int wl12xx_remove(struct platform_device *pdev) static void wl12xx_remove(struct platform_device *pdev)
{ {
struct wl1271 *wl = platform_get_drvdata(pdev); struct wl1271 *wl = platform_get_drvdata(pdev);
struct wl12xx_priv *priv; struct wl12xx_priv *priv;
...@@ -1928,7 +1928,7 @@ static int wl12xx_remove(struct platform_device *pdev) ...@@ -1928,7 +1928,7 @@ static int wl12xx_remove(struct platform_device *pdev)
kfree(priv->rx_mem_addr); kfree(priv->rx_mem_addr);
return wlcore_remove(pdev); wlcore_remove(pdev);
} }
static const struct platform_device_id wl12xx_id_table[] = { static const struct platform_device_id wl12xx_id_table[] = {
...@@ -1939,7 +1939,7 @@ MODULE_DEVICE_TABLE(platform, wl12xx_id_table); ...@@ -1939,7 +1939,7 @@ MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
static struct platform_driver wl12xx_driver = { static struct platform_driver wl12xx_driver = {
.probe = wl12xx_probe, .probe = wl12xx_probe,
.remove = wl12xx_remove, .remove_new = wl12xx_remove,
.id_table = wl12xx_id_table, .id_table = wl12xx_id_table,
.driver = { .driver = {
.name = "wl12xx_driver", .name = "wl12xx_driver",
......
...@@ -2033,7 +2033,7 @@ MODULE_DEVICE_TABLE(platform, wl18xx_id_table); ...@@ -2033,7 +2033,7 @@ MODULE_DEVICE_TABLE(platform, wl18xx_id_table);
static struct platform_driver wl18xx_driver = { static struct platform_driver wl18xx_driver = {
.probe = wl18xx_probe, .probe = wl18xx_probe,
.remove = wlcore_remove, .remove_new = wlcore_remove,
.id_table = wl18xx_id_table, .id_table = wl18xx_id_table,
.driver = { .driver = {
.name = "wl18xx_driver", .name = "wl18xx_driver",
......
...@@ -6737,7 +6737,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) ...@@ -6737,7 +6737,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
} }
EXPORT_SYMBOL_GPL(wlcore_probe); EXPORT_SYMBOL_GPL(wlcore_probe);
int wlcore_remove(struct platform_device *pdev) void wlcore_remove(struct platform_device *pdev)
{ {
struct wlcore_platdev_data *pdev_data = dev_get_platdata(&pdev->dev); struct wlcore_platdev_data *pdev_data = dev_get_platdata(&pdev->dev);
struct wl1271 *wl = platform_get_drvdata(pdev); struct wl1271 *wl = platform_get_drvdata(pdev);
...@@ -6752,7 +6752,7 @@ int wlcore_remove(struct platform_device *pdev) ...@@ -6752,7 +6752,7 @@ int wlcore_remove(struct platform_device *pdev)
if (pdev_data->family && pdev_data->family->nvs_name) if (pdev_data->family && pdev_data->family->nvs_name)
wait_for_completion(&wl->nvs_loading_complete); wait_for_completion(&wl->nvs_loading_complete);
if (!wl->initialized) if (!wl->initialized)
return 0; return;
if (wl->wakeirq >= 0) { if (wl->wakeirq >= 0) {
dev_pm_clear_wake_irq(wl->dev); dev_pm_clear_wake_irq(wl->dev);
...@@ -6772,8 +6772,6 @@ int wlcore_remove(struct platform_device *pdev) ...@@ -6772,8 +6772,6 @@ int wlcore_remove(struct platform_device *pdev)
free_irq(wl->irq, wl); free_irq(wl->irq, wl);
wlcore_free_hw(wl); wlcore_free_hw(wl);
return 0;
} }
EXPORT_SYMBOL_GPL(wlcore_remove); EXPORT_SYMBOL_GPL(wlcore_remove);
......
...@@ -497,7 +497,7 @@ struct wl1271 { ...@@ -497,7 +497,7 @@ struct wl1271 {
}; };
int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev); int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
int wlcore_remove(struct platform_device *pdev); void wlcore_remove(struct platform_device *pdev);
struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size, struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size,
u32 mbox_size); u32 mbox_size);
int wlcore_free_hw(struct wl1271 *wl); int wlcore_free_hw(struct wl1271 *wl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment