Skip to content

Commit 76be075

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: dsa: rzn1_a5psw: 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> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent d48a547 commit 76be075

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/net/dsa/rzn1_a5psw.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,19 +1272,17 @@ static int a5psw_probe(struct platform_device *pdev)
12721272
return ret;
12731273
}
12741274

1275-
static int a5psw_remove(struct platform_device *pdev)
1275+
static void a5psw_remove(struct platform_device *pdev)
12761276
{
12771277
struct a5psw *a5psw = platform_get_drvdata(pdev);
12781278

12791279
if (!a5psw)
1280-
return 0;
1280+
return;
12811281

12821282
dsa_unregister_switch(&a5psw->ds);
12831283
a5psw_pcs_free(a5psw);
12841284
clk_disable_unprepare(a5psw->hclk);
12851285
clk_disable_unprepare(a5psw->clk);
1286-
1287-
return 0;
12881286
}
12891287

12901288
static void a5psw_shutdown(struct platform_device *pdev)
@@ -1311,7 +1309,7 @@ static struct platform_driver a5psw_driver = {
13111309
.of_match_table = a5psw_of_mtable,
13121310
},
13131311
.probe = a5psw_probe,
1314-
.remove = a5psw_remove,
1312+
.remove_new = a5psw_remove,
13151313
.shutdown = a5psw_shutdown,
13161314
};
13171315
module_platform_driver(a5psw_driver);

0 commit comments

Comments
 (0)