]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: dsa: vitesse-vsc73xx: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 18 Sep 2023 19:19:16 +0000 (21:19 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Sep 2023 09:25:58 +0000 (10:25 +0100)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/vitesse-vsc73xx-platform.c

index bd4206e8f9afcb36f41d885b210faa4439f31a0b..755b7895a15a9dd7d0e34022940c518cb2f6fc6e 100644 (file)
@@ -112,16 +112,14 @@ static int vsc73xx_platform_probe(struct platform_device *pdev)
        return vsc73xx_probe(&vsc_platform->vsc);
 }
 
-static int vsc73xx_platform_remove(struct platform_device *pdev)
+static void vsc73xx_platform_remove(struct platform_device *pdev)
 {
        struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);
 
        if (!vsc_platform)
-               return 0;
+               return;
 
        vsc73xx_remove(&vsc_platform->vsc);
-
-       return 0;
 }
 
 static void vsc73xx_platform_shutdown(struct platform_device *pdev)
@@ -160,7 +158,7 @@ MODULE_DEVICE_TABLE(of, vsc73xx_of_match);
 
 static struct platform_driver vsc73xx_platform_driver = {
        .probe = vsc73xx_platform_probe,
-       .remove = vsc73xx_platform_remove,
+       .remove_new = vsc73xx_platform_remove,
        .shutdown = vsc73xx_platform_shutdown,
        .driver = {
                .name = "vsc73xx-platform",