net: ethernet: mscc: 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 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 151b4246534839c574310d86aa777c65dac695ab..993212c3a7da6f76139abc2273de216e4e515217 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -392,7 +392,7 @@ out_free_devlink:
        return err;
 }
 
-static int mscc_ocelot_remove(struct platform_device *pdev)
+static void mscc_ocelot_remove(struct platform_device *pdev)
 {
        struct ocelot *ocelot = platform_get_drvdata(pdev);
 
@@ -408,13 +408,11 @@ static int mscc_ocelot_remove(struct platform_device *pdev)
        unregister_switchdev_notifier(&ocelot_switchdev_nb);
        unregister_netdevice_notifier(&ocelot_netdevice_nb);
        devlink_free(ocelot->devlink);
-
-       return 0;
 }
 
 static struct platform_driver mscc_ocelot_driver = {
        .probe = mscc_ocelot_probe,
-       .remove = mscc_ocelot_remove,
+       .remove_new = mscc_ocelot_remove,
        .driver = {
                .name = "ocelot-switch",
                .of_match_table = mscc_ocelot_match,