From: Stefan Wahren <stefan.wahren@i2se.com>
To: Jonathan Cameron <jic23@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Marek Vasut <marex@denx.de>
Cc: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>,
Fabio Estevam <fabio.estevam@nxp.com>,
Juergen Borleis <jbe@pengutronix.de>,
linux-iio@vger.kernel.org, linux-input@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Stefan Wahren <stefan.wahren@i2se.com>
Subject: [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister
Date: Sat, 23 Apr 2016 19:57:58 +0000 [thread overview]
Message-ID: <1461441479-23218-3-git-send-email-stefan.wahren@i2se.com> (raw)
In-Reply-To: <1461441479-23218-1-git-send-email-stefan.wahren@i2se.com>
After using devm_input_allocate_device for registration
the function mxs_lradc_ts_unregister isn't necessary anymore
since mxs_lradc_ts_close already does the job.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/iio/adc/mxs-lradc.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
index 3d1d370..90242ba 100644
--- a/drivers/iio/adc/mxs-lradc.c
+++ b/drivers/iio/adc/mxs-lradc.c
@@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc)
return input_register_device(input);
}
-static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc)
-{
- if (!lradc->use_touchscreen)
- return;
-
- mxs_lradc_disable_ts(lradc);
-}
-
/*
* IRQ Handling
*/
@@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev)
ret = iio_device_register(iio);
if (ret) {
dev_err(dev, "Failed to register IIO device\n");
- goto err_ts;
+ return ret;
}
return 0;
-err_ts:
- mxs_lradc_ts_unregister(lradc);
err_ts_register:
mxs_lradc_hw_stop(lradc);
err_dev:
@@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev)
struct mxs_lradc *lradc = iio_priv(iio);
iio_device_unregister(iio);
- mxs_lradc_ts_unregister(lradc);
mxs_lradc_hw_stop(lradc);
mxs_lradc_trigger_remove(iio);
iio_triggered_buffer_cleanup(iio);
--
1.7.9.5
next prev parent reply other threads:[~2016-04-23 19:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren
2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren
[not found] ` <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-04-25 21:00 ` Dmitry Torokhov
2016-05-04 9:38 ` Jonathan Cameron
2016-04-23 19:57 ` Stefan Wahren [this message]
[not found] ` <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-04-25 21:00 ` [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Dmitry Torokhov
2016-05-04 9:39 ` Jonathan Cameron
2016-04-23 19:57 ` [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop Stefan Wahren
[not found] ` <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-05-04 9:39 ` Jonathan Cameron
2016-05-01 20:08 ` [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Jonathan Cameron
[not found] ` <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-02 6:06 ` Ksenija Stanojević
[not found] ` <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-05-04 9:40 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461441479-23218-3-git-send-email-stefan.wahren@i2se.com \
--to=stefan.wahren@i2se.com \
--cc=dmitry.torokhov@gmail.com \
--cc=fabio.estevam@nxp.com \
--cc=jbe@pengutronix.de \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=ksenija.stanojevic@gmail.com \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=marex@denx.de \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).