Skip to content

Commit

Permalink
tpm/tpm_ftpm_tee: 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.

ftpm_tee_remove() returns zero unconditionally (and cannot easily
converted to return void). So ignore the return value to be able to make
ftpm_plat_tee_remove() return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Jarkko Sakkinen committed Apr 24, 2023
1 parent 3fb29a2 commit bd88328
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/char/tpm/tpm_ftpm_tee.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,11 @@ static int ftpm_tee_remove(struct device *dev)
return 0;
}

static int ftpm_plat_tee_remove(struct platform_device *pdev)
static void ftpm_plat_tee_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;

return ftpm_tee_remove(dev);
ftpm_tee_remove(dev);
}

/**
Expand Down Expand Up @@ -367,7 +367,7 @@ static struct platform_driver ftpm_tee_plat_driver = {
},
.shutdown = ftpm_plat_tee_shutdown,
.probe = ftpm_plat_tee_probe,
.remove = ftpm_plat_tee_remove,
.remove_new = ftpm_plat_tee_remove,
};

/* UUID of the fTPM TA */
Expand Down

0 comments on commit bd88328

Please sign in to comment.