net: ethernet: amd: 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 these drivers 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/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index c5cec4e794895d81ae0bf637317a1caf4a4ddfa7..85c978149bf660201204773b341cd9a6a28262f8 100644 (file)
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1323,7 +1323,7 @@ out:
        return err;
 }
 
-static int au1000_remove(struct platform_device *pdev)
+static void au1000_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
        struct au1000_private *aup = netdev_priv(dev);
@@ -1359,13 +1359,11 @@ static int au1000_remove(struct platform_device *pdev)
        release_mem_region(macen->start, resource_size(macen));
 
        free_netdev(dev);
-
-       return 0;
 }
 
 static struct platform_driver au1000_eth_driver = {
        .probe  = au1000_probe,
-       .remove = au1000_remove,
+       .remove_new = au1000_remove,
        .driver = {
                .name   = "au1000-eth",
        },

diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 33bb539ad70a8a993336145e009a6f467b7f879a..c78706d21a6afeff1228891810d637da640a6567 100644 (file)
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1487,7 +1487,7 @@ static int sunlance_sbus_probe(struct platform_device *op)
        return err;
 }
 
-static int sunlance_sbus_remove(struct platform_device *op)
+static void sunlance_sbus_remove(struct platform_device *op)
 {
        struct lance_private *lp = platform_get_drvdata(op);
        struct net_device *net_dev = lp->dev;
@@ -1497,8 +1497,6 @@ static int sunlance_sbus_remove(struct platform_device *op)
        lance_free_hwresources(lp);
 
        free_netdev(net_dev);
-
-       return 0;
 }
 
 static const struct of_device_id sunlance_sbus_match[] = {
@@ -1516,7 +1514,7 @@ static struct platform_driver sunlance_sbus_driver = {
                .of_match_table = sunlance_sbus_match,
        },
        .probe          = sunlance_sbus_probe,
-       .remove         = sunlance_sbus_remove,
+       .remove_new     = sunlance_sbus_remove,
 };
 
 module_platform_driver(sunlance_sbus_driver);

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
index 4d790a89fe7717cffe7c502949dbc0e5ce4895b6..91842a5e161b3bc693fbbbb85d35048c1721487e 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
@@ -512,7 +512,7 @@ err_alloc:
        return ret;
 }
 
-static int xgbe_platform_remove(struct platform_device *pdev)
+static void xgbe_platform_remove(struct platform_device *pdev)
 {
        struct xgbe_prv_data *pdata = platform_get_drvdata(pdev);
 
@@ -521,8 +521,6 @@ static int xgbe_platform_remove(struct platform_device *pdev)
        platform_device_put(pdata->phy_platdev);
 
        xgbe_free_pdata(pdata);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -615,7 +613,7 @@ static struct platform_driver xgbe_driver = {
                .pm = &xgbe_platform_pm_ops,
        },
        .probe = xgbe_platform_probe,
-       .remove = xgbe_platform_remove,
+       .remove_new = xgbe_platform_remove,
 };
 
 int xgbe_platform_init(void)