linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: axp20x-pek: use devm_add_action_or_reset
@ 2016-06-12 14:12 Sudip Mukherjee
  2016-06-13  3:53 ` Chen-Yu Tsai
  2016-07-03 20:40 ` Sudip Mukherjee
  0 siblings, 2 replies; 4+ messages in thread
From: Sudip Mukherjee @ 2016-06-12 14:12 UTC (permalink / raw)
  To: Dmitry Torokhov, Chen-Yu Tsai; +Cc: linux-kernel, linux-input, Sudip Mukherjee

If devm_add_action() fails we are explicitly calling
axp20x_remove_sysfs_group() 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/input/misc/axp20x-pek.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
index 1ac898d..419ca97 100644
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@ -260,10 +260,10 @@ static int axp20x_pek_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	error = devm_add_action(&pdev->dev,
-				axp20x_remove_sysfs_group, &pdev->dev);
+	error = devm_add_action_or_reset(&pdev->dev,
+					 axp20x_remove_sysfs_group,
+					 &pdev->dev);
 	if (error) {
-		axp20x_remove_sysfs_group(&pdev->dev);
 		dev_err(&pdev->dev, "Failed to add sysfs cleanup action: %d\n",
 			error);
 		return error;
-- 
1.9.1


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

end of thread, other threads:[~2016-07-06 18:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-12 14:12 [PATCH] Input: axp20x-pek: use devm_add_action_or_reset Sudip Mukherjee
2016-06-13  3:53 ` Chen-Yu Tsai
2016-07-03 20:40 ` Sudip Mukherjee
2016-07-06 18:01   ` Dmitry Torokhov

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