Skip to content

Commit

Permalink
net: ethernet: ti: cpsw: Convert to platform remove callback returnin…
Browse files Browse the repository at this point in the history
…g 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() will be renamed to .remove().

Replace the error path returning a non-zero value by an error message
and a comment that there is more to do. With that this patch results in
no change of behaviour in this driver apart from improving the error
message.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Uwe Kleine-König authored and Paolo Abeni committed Nov 30, 2023
1 parent 7234dc5 commit 7ac3f86
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/net/ethernet/ti/cpsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1722,14 +1722,20 @@ static int cpsw_probe(struct platform_device *pdev)
return ret;
}

static int cpsw_remove(struct platform_device *pdev)
static void cpsw_remove(struct platform_device *pdev)
{
struct cpsw_common *cpsw = platform_get_drvdata(pdev);
int i, ret;

ret = pm_runtime_resume_and_get(&pdev->dev);
if (ret < 0)
return ret;
if (ret < 0) {
/* Note, if this error path is taken, we're leaking some
* resources.
*/
dev_err(&pdev->dev, "Failed to resume device (%pe)\n",
ERR_PTR(ret));
return;
}

for (i = 0; i < cpsw->data.slaves; i++)
if (cpsw->slaves[i].ndev)
Expand All @@ -1740,7 +1746,6 @@ static int cpsw_remove(struct platform_device *pdev)
cpsw_remove_dt(pdev);
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down Expand Up @@ -1795,7 +1800,7 @@ static struct platform_driver cpsw_driver = {
.of_match_table = cpsw_of_mtable,
},
.probe = cpsw_probe,
.remove = cpsw_remove,
.remove_new = cpsw_remove,
};

module_platform_driver(cpsw_driver);
Expand Down

0 comments on commit 7ac3f86

Please sign in to comment.