OSDN Git Service

net: stmmac: dwmac-sti: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 8 May 2023 14:26:34 +0000 (16:26 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 10 May 2023 02:57:01 +0000 (19:57 -0700)
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 (mostly) ignored
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.

Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

index 465ce66..dcbb17c 100644 (file)
@@ -317,15 +317,13 @@ err_remove_config_dt:
        return ret;
 }
 
-static int sti_dwmac_remove(struct platform_device *pdev)
+static void sti_dwmac_remove(struct platform_device *pdev)
 {
        struct sti_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);
 
        stmmac_dvr_remove(&pdev->dev);
 
        clk_disable_unprepare(dwmac->clk);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -365,7 +363,7 @@ MODULE_DEVICE_TABLE(of, sti_dwmac_match);
 
 static struct platform_driver sti_dwmac_driver = {
        .probe  = sti_dwmac_probe,
-       .remove = sti_dwmac_remove,
+       .remove_new = sti_dwmac_remove,
        .driver = {
                .name           = "sti-dwmac",
                .pm             = &sti_dwmac_pm_ops,