From patchwork Wed Jan 18 20:36:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9524755 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 A157660113 for ; Wed, 18 Jan 2017 20:39:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91738285F0 for ; Wed, 18 Jan 2017 20:39:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84B2228637; Wed, 18 Jan 2017 20:39:45 +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 5F9B9285F0 for ; Wed, 18 Jan 2017 20:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751988AbdARUhM (ORCPT ); Wed, 18 Jan 2017 15:37:12 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:59466 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbdARUhL (ORCPT ); Wed, 18 Jan 2017 15:37:11 -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=wBcB1HsycmCPw7CFzGW6b+zNKHKRp1ahmpDYC6pu/uw=; b=LoLgRM7C/IEGNP V1UYeGW+9kRxAZpt93L15AADHlmVBfFIOl7qMZnmJ6bHsxbTaLpabbKfxedz4SROfY000lD4sLbIP PfIdhZfQGA+z25mL2sKuSyWTDrCZ+Xph4cM/VgdSkv0ccgmBjiLFc/+xrXXoC2jt3BTPQbiZOBnDR hwNGAkbkKyr5Z/0s0ihQqs53Lr55jVOPgcboNFaSNJkczgp0MzIl1PMPtQeO9Bm4YCIgTPJi+CCyC 69uM2wGFEPRyy42B5GkfaeIj6OBdmpOZq+/AryyD4kfFFpfuctGdFK7nF2ccF6K6zmI06T52vB77F 0R9Ibx/Lzo6dU4cB0G/w==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:46476 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1cTwyk-000PiT-3s; Wed, 18 Jan 2017 20:37:10 +0000 From: Guenter Roeck To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH 31/33] Input: rohm_bu21023 - Use 'dev' instead of dereferencing it and other changes Date: Wed, 18 Jan 2017 12:36:48 -0800 Message-Id: <1484771819-13761-2-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484771819-13761-1-git-send-email-linux@roeck-us.net> References: <1484761614-12225-1-git-send-email-linux@roeck-us.net> <1484771819-13761-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 Use local variable 'dev' instead of dereferencing it several times. Other relevant changes: Replace devm_add_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() - Use local variable 'struct device *dev' consistently Signed-off-by: Guenter Roeck --- drivers/input/touchscreen/rohm_bu21023.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/rohm_bu21023.c b/drivers/input/touchscreen/rohm_bu21023.c index 611156a2ef80..cce3ef94c1ab 100644 --- a/drivers/input/touchscreen/rohm_bu21023.c +++ b/drivers/input/touchscreen/rohm_bu21023.c @@ -1166,9 +1166,9 @@ static int rohm_bu21023_i2c_probe(struct i2c_client *client, return error; } - error = devm_request_threaded_irq(dev, client->irq, - NULL, rohm_ts_soft_irq, - IRQF_ONESHOT, client->name, ts); + error = devm_request_threaded_irq(dev, client->irq, NULL, + rohm_ts_soft_irq, IRQF_ONESHOT, + client->name, ts); if (error) { dev_err(dev, "failed to request IRQ: %d\n", error); return error; @@ -1186,11 +1186,9 @@ static int rohm_bu21023_i2c_probe(struct i2c_client *client, return error; } - error = devm_add_action(dev, rohm_ts_remove_sysfs_group, dev); + error = devm_add_action_or_reset(dev, rohm_ts_remove_sysfs_group, dev); if (error) { - rohm_ts_remove_sysfs_group(dev); - dev_err(&client->dev, - "Failed to add sysfs cleanup action: %d\n", + dev_err(dev, "Failed to add sysfs cleanup action: %d\n", error); return error; }