From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743AbdARRvg (ORCPT ); Wed, 18 Jan 2017 12:51:36 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:58914 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753307AbdARRsy (ORCPT ); Wed, 18 Jan 2017 12:48:54 -0500 From: Guenter Roeck To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Chen-Yu Tsai Subject: [PATCH 12/33] Input: axp20x-pek - Use devm_add_action_or_reset and other changes Date: Wed, 18 Jan 2017 09:46:33 -0800 Message-Id: <1484761614-12225-13-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484761614-12225-1-git-send-email-linux@roeck-us.net> References: <1484761614-12225-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace devm_add_action() followed by failure action with devm_add_action_or_reset() This conversion was done automatically with coccinelle using the following semantic patches. The semantic patches and the scripts used to generate this commit log are available at https://github.com/groeck/coccinelle-patches - Replace devm_add_action() followed by failure action with devm_add_action_or_reset() Signed-off-by: Guenter Roeck --- 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 1ac898db303a..419ca97b051b 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; -- 2.7.4