Skip to content

Commit 75f5205

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: dsa: bcm_sf2: 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: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent c306171 commit 75f5205

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/net/dsa/bcm_sf2.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,12 +1537,12 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
15371537
return ret;
15381538
}
15391539

1540-
static int bcm_sf2_sw_remove(struct platform_device *pdev)
1540+
static void bcm_sf2_sw_remove(struct platform_device *pdev)
15411541
{
15421542
struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
15431543

15441544
if (!priv)
1545-
return 0;
1545+
return;
15461546

15471547
priv->wol_ports_mask = 0;
15481548
/* Disable interrupts */
@@ -1554,8 +1554,6 @@ static int bcm_sf2_sw_remove(struct platform_device *pdev)
15541554
clk_disable_unprepare(priv->clk);
15551555
if (priv->type == BCM7278_DEVICE_ID)
15561556
reset_control_assert(priv->rcdev);
1557-
1558-
return 0;
15591557
}
15601558

15611559
static void bcm_sf2_sw_shutdown(struct platform_device *pdev)
@@ -1601,7 +1599,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sf2_pm_ops,
16011599

16021600
static struct platform_driver bcm_sf2_driver = {
16031601
.probe = bcm_sf2_sw_probe,
1604-
.remove = bcm_sf2_sw_remove,
1602+
.remove_new = bcm_sf2_sw_remove,
16051603
.shutdown = bcm_sf2_sw_shutdown,
16061604
.driver = {
16071605
.name = "brcm-sf2",

0 commit comments

Comments
 (0)