From patchwork Wed Jan 18 17:46:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9524463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD4AC6020B for ; Wed, 18 Jan 2017 17:52:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE74E26E8A for ; Wed, 18 Jan 2017 17:52:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C292128618; Wed, 18 Jan 2017 17:52:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CC4A26E8A for ; Wed, 18 Jan 2017 17:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753656AbdARRve (ORCPT ); Wed, 18 Jan 2017 12:51:34 -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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From; bh=Bh0O+oTKOBigaiqWdCgmmLcWWaxzmmwXdw5joVxUwnM=; b=apSiYHniEYZ+Bj eAI6KJ+SlSiW5ClEN4wCGCNfgFLonmvJGqdWXmlpVjKLi2fUoE43opolniZn4rM/sV42qGIoZnWWM j7Hb2bgmlhAt+Kk0A5G61ma/CA0oEOEEKul4qo1Bk6HghAbXb7GsxkqDRshn77akSPMhKbdleFBqF 06JwtcKmBD09g2GD33Y5noJbgjQ3Sahq4K59h/4R1ao3XVJSzYqMV3Ul7dhu09mABzRDZEHWLxKc4 mJCMfp7GC6B3VpqPaSzgzA0Gt7K+XIuExBsL4uhrzl1ldWSSwjy+L0IsCsb16AOUY+aSL5G8WcJk/ vv0QlB7LJBk/hQc8Tv0Q==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:45170 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1cTuKw-001jyq-7i; Wed, 18 Jan 2017 17:47:54 +0000 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-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Chen-Yu Tsai --- 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;