linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] memory: tegra: Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 13:00 Cai Huoqing
  2021-09-24 11:20 ` Krzysztof Kozlowski
  0 siblings, 1 reply; 2+ messages in thread
From: Cai Huoqing @ 2021-09-22 13:00 UTC (permalink / raw)
  To: caihuoqing
  Cc: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter,
	linux-kernel, linux-tegra

The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/memory/tegra/mc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
index 6b710c204799..44b4a4080920 100644
--- a/drivers/memory/tegra/mc.c
+++ b/drivers/memory/tegra/mc.c
@@ -87,11 +87,9 @@ struct tegra_mc *devm_tegra_memory_controller_get(struct device *dev)
 		return ERR_PTR(-EPROBE_DEFER);
 	}
 
-	err = devm_add_action(dev, tegra_mc_devm_action_put_device, mc);
-	if (err) {
-		put_device(mc->dev);
+	err = devm_add_action_or_reset(dev, tegra_mc_devm_action_put_device, mc);
+	if (err)
 		return ERR_PTR(err);
-	}
 
 	return mc;
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] memory: tegra: Make use of the helper function devm_add_action_or_reset()
  2021-09-22 13:00 [PATCH] memory: tegra: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
@ 2021-09-24 11:20 ` Krzysztof Kozlowski
  0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-24 11:20 UTC (permalink / raw)
  To: Cai Huoqing
  Cc: Krzysztof Kozlowski, linux-tegra, linux-kernel, Thierry Reding,
	Jonathan Hunter

On Wed, 22 Sep 2021 21:00:01 +0800, Cai Huoqing wrote:
> The helper function devm_add_action_or_reset() will internally
> call devm_add_action(), and if devm_add_action() fails then it will
> execute the action mentioned and return the error code. So
> use devm_add_action_or_reset() instead of devm_add_action()
> to simplify the error handling, reduce the code.
> 
> 
> [...]

Applied, with simplified commit msg (no need to write too much for such simple
change), thanks!

[1/1] memory: tegra: Make use of the helper function devm_add_action_or_reset()
      commit: 1d8e0223bb52071ffc59391f0ebefa06ce5643d7

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-24 11:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 13:00 [PATCH] memory: tegra: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-24 11:20 ` Krzysztof Kozlowski

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).