From patchwork Wed Nov 8 15:50:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 10048719 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 B3B19603FF for ; Wed, 8 Nov 2017 15:51:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E8132A523 for ; Wed, 8 Nov 2017 15:51:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 938042A694; Wed, 8 Nov 2017 15:51:28 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 293462A52E for ; Wed, 8 Nov 2017 15:51:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752767AbdKHPvA (ORCPT ); Wed, 8 Nov 2017 10:51:00 -0500 Received: from 12.mo3.mail-out.ovh.net ([188.165.41.191]:57737 "EHLO 12.mo3.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752608AbdKHPu6 (ORCPT ); Wed, 8 Nov 2017 10:50:58 -0500 Received: from player771.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 9C96316E9B1 for ; Wed, 8 Nov 2017 16:50:57 +0100 (CET) Received: from etezian.org (unknown [211.196.237.107]) (Authenticated sender: andi@etezian.org) by player771.ha.ovh.net (Postfix) with ESMTPSA id E94708400A8; Wed, 8 Nov 2017 16:50:48 +0100 (CET) From: Andi Shyti To: Dmitry Torokhov Cc: Michael Hennerich , Lars-Peter Clausen , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH v3 2/3] Input: ad7897 - use devm_add_action_or_reset to disable the device Date: Wed, 8 Nov 2017 17:50:19 +0200 Message-Id: <20171108155020.3851-3-andi@etezian.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171108155020.3851-1-andi@etezian.org> References: <20171108155020.3851-1-andi@etezian.org> X-Ovh-Tracer-Id: 2873578038504440474 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedttddrheelgdekfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd 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 the ad7877_disable() as a custom action when the driver gets removed instead of calling it from the remove function. Because ad7877_remove() was just calling the disable function, get rid of it. CC: Michael Hennerich Signed-off-by: Andi Shyti --- drivers/input/touchscreen/ad7877.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index dd59e4a5eb7d..04ab8fbc8184 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -417,8 +417,10 @@ static irqreturn_t ad7877_irq(int irq, void *handle) return IRQ_HANDLED; } -static void ad7877_disable(struct ad7877 *ts) +static void ad7877_disable(void *data) { + struct ad7877 *ts = data; + mutex_lock(&ts->mutex); if (!ts->disabled) { @@ -712,6 +714,10 @@ static int ad7877_probe(struct spi_device *spi) if (!ts || !input_dev) return -ENOMEM; + err = devm_add_action_or_reset(&spi->dev, ad7877_disable, ts); + if (err) + return err; + spi_set_drvdata(spi, ts); ts->spi = spi; ts->input = input_dev; @@ -787,17 +793,6 @@ static int ad7877_probe(struct spi_device *spi) return input_register_device(input_dev); } -static int ad7877_remove(struct spi_device *spi) -{ - struct ad7877 *ts = spi_get_drvdata(spi); - - ad7877_disable(ts); - - dev_dbg(&spi->dev, "unregistered touchscreen\n"); - - return 0; -} - static int __maybe_unused ad7877_suspend(struct device *dev) { struct ad7877 *ts = dev_get_drvdata(dev); @@ -824,7 +819,6 @@ static struct spi_driver ad7877_driver = { .pm = &ad7877_pm, }, .probe = ad7877_probe, - .remove = ad7877_remove, }; module_spi_driver(ad7877_driver);