mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
4354b34f6f
Backport lots upstream changes, many of them fixes, for the mt7530 DSA driver, similar to how it was done for Linux 6.1 in the previous commit. The remaining differences compared to the upstream driver are only the 'slave' -> 'user', 'master' -> 'conduit' language change in DSA and the rename of 'struct ethtool_eee' to 'struct ethtool_keee' as well as tree-wide replacement of ethtool_sprintf with ethtool_puts, all of them do not have any functional impact. Apart from some minor bug fixes and style improvements the switch should now behave more conformant when it comes to link-local frames, and we will again be able to cleanly pick patches from upstream. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From b91ef50f70e7c092c50c1b92e63ef3fb0041cdd4 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 01/30] 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
|
|
@@ -63,15 +63,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)
|
|
@@ -88,7 +85,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",
|