net: ethernet: broadcom: 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>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 41a6098eb0c2f610dfd657c639d59fdd25c1615c..29b04a274d077375d9658ea91c16df1ccd963969 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1344,17 +1344,15 @@ of_put_exit:
        return ret;
 }
 
-static int bcmasp_remove(struct platform_device *pdev)
+static void bcmasp_remove(struct platform_device *pdev)
 {
        struct bcmasp_priv *priv = dev_get_drvdata(&pdev->dev);
 
        if (!priv)
-               return 0;
+               return;
 
        priv->destroy_wol(priv);
        bcmasp_remove_intfs(priv);
-
-       return 0;
 }
 
 static void bcmasp_shutdown(struct platform_device *pdev)
@@ -1428,7 +1426,7 @@ static SIMPLE_DEV_PM_OPS(bcmasp_pm_ops,
 
 static struct platform_driver bcmasp_driver = {
        .probe = bcmasp_probe,
-       .remove = bcmasp_remove,
+       .remove_new = bcmasp_remove,
        .shutdown = bcmasp_shutdown,
        .driver = {
                .name = "brcm,asp-v2",

diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 33d86683af505c78aae2ce1c812e5f496cb71eb8..3e7c8671cd116485252414e3dc3235d80054495d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -768,7 +768,7 @@ err_dma_free:
        return err;
 }
 
-static int bcm4908_enet_remove(struct platform_device *pdev)
+static void bcm4908_enet_remove(struct platform_device *pdev)
 {
        struct bcm4908_enet *enet = platform_get_drvdata(pdev);
 
@@ -776,8 +776,6 @@ static int bcm4908_enet_remove(struct platform_device *pdev)
        netif_napi_del(&enet->rx_ring.napi);
        netif_napi_del(&enet->tx_ring.napi);
        bcm4908_enet_dma_free(enet);
-
-       return 0;
 }
 
 static const struct of_device_id bcm4908_enet_of_match[] = {
@@ -791,7 +789,7 @@ static struct platform_driver bcm4908_enet_driver = {
                .of_match_table = bcm4908_enet_of_match,
        },
        .probe  = bcm4908_enet_probe,
-       .remove = bcm4908_enet_remove,
+       .remove_new = bcm4908_enet_remove,
 };
 module_platform_driver(bcm4908_enet_driver);
 

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index a741070f1f9a0290d6a9971bf8f7bda67e6946ea..105afde5dbe1fa953e09903a062d2a8c26d5ed63 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1902,7 +1902,7 @@ out:
 /*
  * exit func, stops hardware and unregisters netdevice
  */
-static int bcm_enet_remove(struct platform_device *pdev)
+static void bcm_enet_remove(struct platform_device *pdev)
 {
        struct bcm_enet_priv *priv;
        struct net_device *dev;
@@ -1932,12 +1932,11 @@ static int bcm_enet_remove(struct platform_device *pdev)
        clk_disable_unprepare(priv->mac_clk);
 
        free_netdev(dev);
-       return 0;
 }
 
 static struct platform_driver bcm63xx_enet_driver = {
        .probe  = bcm_enet_probe,
-       .remove = bcm_enet_remove,
+       .remove_new = bcm_enet_remove,
        .driver = {
                .name   = "bcm63xx_enet",
        },
@@ -2739,7 +2738,7 @@ out:
 
 
 /* exit func, stops hardware and unregisters netdevice */
-static int bcm_enetsw_remove(struct platform_device *pdev)
+static void bcm_enetsw_remove(struct platform_device *pdev)
 {
        struct bcm_enet_priv *priv;
        struct net_device *dev;
@@ -2752,12 +2751,11 @@ static int bcm_enetsw_remove(struct platform_device *pdev)
        clk_disable_unprepare(priv->mac_clk);
 
        free_netdev(dev);
-       return 0;
 }
 
 static struct platform_driver bcm63xx_enetsw_driver = {
        .probe  = bcm_enetsw_probe,
-       .remove = bcm_enetsw_remove,
+       .remove_new = bcm_enetsw_remove,
        .driver = {
                .name   = "bcm63xx_enetsw",
        },

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index bf1611cce974a95d6e53df6cf52e0a47ecf25311..ab096795e8059850241c1ba82dce1238d32f26af 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -2648,7 +2648,7 @@ err_free_netdev:
        return ret;
 }
 
-static int bcm_sysport_remove(struct platform_device *pdev)
+static void bcm_sysport_remove(struct platform_device *pdev)
 {
        struct net_device *dev = dev_get_drvdata(&pdev->dev);
        struct bcm_sysport_priv *priv = netdev_priv(dev);
@@ -2663,8 +2663,6 @@ static int bcm_sysport_remove(struct platform_device *pdev)
                of_phy_deregister_fixed_link(dn);
        free_netdev(dev);
        dev_set_drvdata(&pdev->dev, NULL);
-
-       return 0;
 }
 
 static int bcm_sysport_suspend_to_wol(struct bcm_sysport_priv *priv)
@@ -2901,7 +2899,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sysport_pm_ops,
 
 static struct platform_driver bcm_sysport_driver = {
        .probe  = bcm_sysport_probe,
-       .remove = bcm_sysport_remove,
+       .remove_new = bcm_sysport_remove,
        .driver =  {
                .name = "brcm-systemport",
                .of_match_table = bcm_sysport_of_match,

diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index b4381cd41979286fe21598a5ba14e569958af3fa..0b21fd5bd4575e7a76d52e704051d3e6d30c0f72 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -246,13 +246,11 @@ static int bgmac_probe(struct platform_device *pdev)
        return bgmac_enet_probe(bgmac);
 }
 
-static int bgmac_remove(struct platform_device *pdev)
+static void bgmac_remove(struct platform_device *pdev)
 {
        struct bgmac *bgmac = platform_get_drvdata(pdev);
 
        bgmac_enet_remove(bgmac);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM
@@ -296,7 +294,7 @@ static struct platform_driver bgmac_enet_driver = {
                .pm = BGMAC_PM_OPS
        },
        .probe = bgmac_probe,
-       .remove = bgmac_remove,
+       .remove_new = bgmac_remove,
 };
 
 module_platform_driver(bgmac_enet_driver);

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 24bade875ca6a118497b085362fef06028af0bef..91f3a7e78d657cbfe1a3d70f00bce6289d4ef5d4 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -4164,7 +4164,7 @@ err:
        return err;
 }
 
-static int bcmgenet_remove(struct platform_device *pdev)
+static void bcmgenet_remove(struct platform_device *pdev)
 {
        struct bcmgenet_priv *priv = dev_to_priv(&pdev->dev);
 
@@ -4172,8 +4172,6 @@ static int bcmgenet_remove(struct platform_device *pdev)
        unregister_netdev(priv->dev);
        bcmgenet_mii_exit(priv->dev);
        free_netdev(priv->dev);
-
-       return 0;
 }
 
 static void bcmgenet_shutdown(struct platform_device *pdev)
@@ -4352,7 +4350,7 @@ MODULE_DEVICE_TABLE(acpi, genet_acpi_match);
 
 static struct platform_driver bcmgenet_driver = {
        .probe  = bcmgenet_probe,
-       .remove = bcmgenet_remove,
+       .remove_new = bcmgenet_remove,
        .shutdown = bcmgenet_shutdown,
        .driver = {
                .name   = "bcmgenet",

diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index 3a6763c5e8b3db487f21f25ee66da014744e4069..fcf8485f344602e2d010d3e1600fe5022e1a2827 100644 (file)
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2593,7 +2593,7 @@ out_out:
        return err;
 }
 
-static int sbmac_remove(struct platform_device *pldev)
+static void sbmac_remove(struct platform_device *pldev)
 {
        struct net_device *dev = platform_get_drvdata(pldev);
        struct sbmac_softc *sc = netdev_priv(dev);
@@ -2604,13 +2604,11 @@ static int sbmac_remove(struct platform_device *pldev)
        mdiobus_free(sc->mii_bus);
        iounmap(sc->sbm_base);
        free_netdev(dev);
-
-       return 0;
 }
 
 static struct platform_driver sbmac_driver = {
        .probe = sbmac_probe,
-       .remove = sbmac_remove,
+       .remove_new = sbmac_remove,
        .driver = {
                .name = sbmac_string,
        },