From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbdKHPXl (ORCPT ); Wed, 8 Nov 2017 10:23:41 -0500 Received: from 3.mo3.mail-out.ovh.net ([46.105.44.175]:56230 "EHLO 3.mo3.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbdKHPXk (ORCPT ); Wed, 8 Nov 2017 10:23:40 -0500 X-Greylist: delayed 2399 seconds by postgrey-1.27 at vger.kernel.org; Wed, 08 Nov 2017 10:23:40 EST From: Andi Shyti To: Dmitry Torokhov Cc: Michael Hennerich , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH v2 2/3] Input: ad7897 - use devm_add_action_or_reset to disable the device Date: Wed, 8 Nov 2017 16:04:02 +0200 Message-Id: <20171108140403.727-3-andi@etezian.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171108140403.727-1-andi@etezian.org> References: <20171108140403.727-1-andi@etezian.org> X-Ovh-Tracer-Id: 1079456539052130970 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedttddrheelgdeitdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 c8a143db8681..cf59e569d890 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 (!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); -- 2.15.0