lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] tpm: use devm_add_action_or_reset
On Mon, Apr 25, 2016 at 09:46:38PM +0100, Sudip Mukherjee wrote:
> If devm_add_action() fails we are explicitly calling the cleanup function
> in the error path. Lets use the helper function devm_add_action_or_reset()
> and return directly as we know the cleanup has been done by the helper.

Have you verified that this compiles against my tree?

/Jarkko

> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
> ---
> drivers/char/tpm/tpm-chip.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 5bc530c..aca4505 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -212,11 +212,10 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev,
> if (IS_ERR(chip))
> return chip;
>
> - rc = devm_add_action(pdev, (void (*)(void *)) put_device, &chip->dev);
> - if (rc) {
> - put_device(&chip->dev);
> + rc = devm_add_action_or_reset(pdev, (void (*)(void *)) put_device,
> + &chip->dev);
> + if (rc)
> return ERR_PTR(rc);
> - }
>
> dev_set_drvdata(pdev, chip);
>
> --
> 1.9.1
>

\
 
 \ /
  Last update: 2016-04-26 10:41    [W:0.046 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site