* [PATCH] tpm: use devm_add_action_or_reset
@ 2016-04-25 20:46 Sudip Mukherjee
2016-04-25 20:57 ` Jason Gunthorpe
2016-04-26 8:30 ` Jarkko Sakkinen
0 siblings, 2 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2016-04-25 20:46 UTC (permalink / raw)
To: Peter Huewe, Marcel Selhorst, Jarkko Sakkinen, Jason Gunthorpe
Cc: linux-kernel, tpmdd-devel, Sudip Mukherjee
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 <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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tpm: use devm_add_action_or_reset
2016-04-25 20:46 [PATCH] tpm: use devm_add_action_or_reset Sudip Mukherjee
@ 2016-04-25 20:57 ` Jason Gunthorpe
2016-04-26 8:30 ` Jarkko Sakkinen
1 sibling, 0 replies; 6+ messages in thread
From: Jason Gunthorpe @ 2016-04-25 20:57 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Peter Huewe, Marcel Selhorst, Jarkko Sakkinen, linux-kernel, tpmdd-devel
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 <jgunthorpe@obsidianresearch.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] tpm: use devm_add_action_or_reset
2016-04-25 20:46 [PATCH] tpm: use devm_add_action_or_reset Sudip Mukherjee
2016-04-25 20:57 ` Jason Gunthorpe
@ 2016-04-26 8:30 ` Jarkko Sakkinen
2016-04-30 17:00 ` Sudip Mukherjee
1 sibling, 1 reply; 6+ messages in thread
From: Jarkko Sakkinen @ 2016-04-26 8:30 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, linux-kernel, tpmdd-devel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] tpm: use devm_add_action_or_reset
2016-04-26 8:30 ` Jarkko Sakkinen
@ 2016-04-30 17:00 ` Sudip Mukherjee
0 siblings, 0 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2016-04-30 17:00 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, linux-kernel, tpmdd-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] tpm: use devm_add_action_or_reset
@ 2016-06-12 14:05 Sudip Mukherjee
2016-06-16 20:28 ` Jarkko Sakkinen
0 siblings, 1 reply; 6+ messages in thread
From: Sudip Mukherjee @ 2016-06-12 14:05 UTC (permalink / raw)
To: Peter Huewe, Marcel Selhorst, Jarkko Sakkinen, Jason Gunthorpe
Cc: linux-kernel, tpmdd-devel, Sudip Mukherjee
If devm_add_action() fails we are explicitly calling put_device() to
free the resources allocated. Lets use the helper
devm_add_action_or_reset() and return directly in case of error, as we
know that the cleanup function has been already called by the helper if
there was any error.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
drivers/char/tpm/tpm-chip.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 1965dc7..5a2f043 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -213,11 +213,11 @@ 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] tpm: use devm_add_action_or_reset
2016-06-12 14:05 Sudip Mukherjee
@ 2016-06-16 20:28 ` Jarkko Sakkinen
0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2016-06-16 20:28 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Peter Huewe, Marcel Selhorst, Jason Gunthorpe, linux-kernel, tpmdd-devel
On Sun, Jun 12, 2016 at 03:05:29PM +0100, Sudip Mukherjee wrote:
> If devm_add_action() fails we are explicitly calling put_device() to
> free the resources allocated. Lets use the helper
> devm_add_action_or_reset() and return directly in case of error, as we
> know that the cleanup function has been already called by the helper if
> there was any error.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm-chip.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 1965dc7..5a2f043 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -213,11 +213,11 @@ 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-16 20:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-25 20:46 [PATCH] tpm: use devm_add_action_or_reset Sudip Mukherjee
2016-04-25 20:57 ` Jason Gunthorpe
2016-04-26 8:30 ` Jarkko Sakkinen
2016-04-30 17:00 ` Sudip Mukherjee
2016-06-12 14:05 Sudip Mukherjee
2016-06-16 20:28 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).