Skip to content

Commit

Permalink
pstore/ram: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230401120000.2487153-1-u.kleine-koenig@pengutronix.de
  • Loading branch information
Uwe Kleine-König authored and Kees Cook committed May 10, 2023
1 parent ac9a786 commit 48f2c68
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions fs/pstore/ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ static int ramoops_probe(struct platform_device *pdev)
return err;
}

static int ramoops_remove(struct platform_device *pdev)
static void ramoops_remove(struct platform_device *pdev)
{
struct ramoops_context *cxt = &oops_cxt;

Expand All @@ -885,8 +885,6 @@ static int ramoops_remove(struct platform_device *pdev)
cxt->pstore.bufsize = 0;

ramoops_free_przs(cxt);

return 0;
}

static const struct of_device_id dt_match[] = {
Expand All @@ -896,7 +894,7 @@ static const struct of_device_id dt_match[] = {

static struct platform_driver ramoops_driver = {
.probe = ramoops_probe,
.remove = ramoops_remove,
.remove_new = ramoops_remove,
.driver = {
.name = "ramoops",
.of_match_table = dt_match,
Expand Down

0 comments on commit 48f2c68

Please sign in to comment.