mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
|
From 03ede98ecc29b59fb364f735d6de0e6a4c1735fc Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
||
|
|
Date: Mon, 18 Sep 2023 21:19:12 +0200
|
||
|
|
Subject: [PATCH 18/48] net: dsa: mt7530: Convert to platform remove callback
|
||
|
|
returning void
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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 ignored (apart
|
||
|
|
from emitting a warning) 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. Eventually after all drivers
|
||
|
|
are converted, .remove_new() is renamed to .remove().
|
||
|
|
|
||
|
|
Trivially convert this driver from always returning zero in the remove
|
||
|
|
callback to the void returning variant.
|
||
|
|
|
||
|
|
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
||
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
||
|
|
Acked-by: Daniel Golle <daniel@makrotopia.org>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
drivers/net/dsa/mt7530-mmio.c | 7 ++-----
|
||
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/dsa/mt7530-mmio.c
|
||
|
|
+++ b/drivers/net/dsa/mt7530-mmio.c
|
||
|
|
@@ -62,15 +62,12 @@ mt7988_probe(struct platform_device *pde
|
||
|
|
return dsa_register_switch(priv->ds);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int
|
||
|
|
-mt7988_remove(struct platform_device *pdev)
|
||
|
|
+static void mt7988_remove(struct platform_device *pdev)
|
||
|
|
{
|
||
|
|
struct mt7530_priv *priv = platform_get_drvdata(pdev);
|
||
|
|
|
||
|
|
if (priv)
|
||
|
|
mt7530_remove_common(priv);
|
||
|
|
-
|
||
|
|
- return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
static void mt7988_shutdown(struct platform_device *pdev)
|
||
|
|
@@ -87,7 +84,7 @@ static void mt7988_shutdown(struct platf
|
||
|
|
|
||
|
|
static struct platform_driver mt7988_platform_driver = {
|
||
|
|
.probe = mt7988_probe,
|
||
|
|
- .remove = mt7988_remove,
|
||
|
|
+ .remove_new = mt7988_remove,
|
||
|
|
.shutdown = mt7988_shutdown,
|
||
|
|
.driver = {
|
||
|
|
.name = "mt7530-mmio",
|