2016-04-25 20:46:47

by Sudip Mukherjee

Subject: [PATCH] tpm: use devm_add_action_or_reset

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.

Signed-off-by: Sudip Mukherjee <[email protected]>
---
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

2016-04-25 20:57:27

by Jason Gunthorpe

Subject: Re: [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.

Seems reasonable to me.

Reviewed-by: Jason Gunthorpe <[email protected]>

2016-04-26 08:30:19

by Jarkko Sakkinen

Subject: Re: [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 <[email protected]>
> ---
> 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
>

2016-04-30 17:00:31

by Sudip Mukherjee

Subject: Re: [PATCH] tpm: use devm_add_action_or_reset

On Tue, Apr 26, 2016 at 11:30:14AM +0300, Jarkko Sakkinen wrote:
> 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?

This was done against linux-next. But now I have just rebased against
the charmisc tree and sent v2. Also added the Reviewed-by tag to it.
(hope thats ok)

regards
sudip