From: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
To: linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>,
Dmitry Torokhov
<dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>,
Patil Rachna <rachna-l0cyMroinI0@public.gmane.org>,
Sebastian Andrzej Siewior
<bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Subject: [PATCH 2/7] input/ti_am33x_tsc: remove platform_data support
Date: Wed, 22 May 2013 23:08:12 +0200 [thread overview]
Message-ID: <1369256897-25984-2-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1369256897-25984-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
This patch removes access to platform data mfd_tscadc_board because the
platform is DT only.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
---
drivers/input/touchscreen/ti_am335x_tsc.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 20f4505..e778ffd 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -24,7 +24,6 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <linux/input/ti_am335x_tsc.h>
#include <linux/delay.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -430,24 +429,6 @@ static int titsc_parse_dt(struct ti_tscadc_dev *tscadc_dev,
return err;
}
-static int titsc_parse_pdata(struct ti_tscadc_dev *tscadc_dev,
- struct titsc *ts_dev)
-{
- struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
-
- if (!pdata)
- return -EINVAL;
-
- ts_dev->wires = pdata->tsc_init->wires;
- ts_dev->x_plate_resistance =
- pdata->tsc_init->x_plate_resistance;
- ts_dev->steps_to_configure =
- pdata->tsc_init->steps_to_configure;
- memcpy(ts_dev->config_inp, pdata->tsc_init->wire_config,
- sizeof(pdata->tsc_init->wire_config));
- return 0;
-}
-
/*
* The functions for inserting/removing driver as a module.
*/
@@ -473,13 +454,9 @@ static int titsc_probe(struct platform_device *pdev)
ts_dev->input = input_dev;
ts_dev->irq = tscadc_dev->irq;
- if (tscadc_dev->dev->platform_data)
- err = titsc_parse_pdata(tscadc_dev, ts_dev);
- else
- err = titsc_parse_dt(tscadc_dev, ts_dev);
-
+ err = titsc_parse_dt(tscadc_dev, ts_dev);
if (err) {
- dev_err(&pdev->dev, "Could not find platform data\n");
+ dev_err(&pdev->dev, "Could not find valid DT data.\n");
err = -EINVAL;
goto err_free_mem;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-05-22 21:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 21:08 [PATCH 1/7] input/ti_am_335x_tsc: remove the else case Sebastian Andrzej Siewior
[not found] ` <1369256897-25984-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-05-22 21:08 ` Sebastian Andrzej Siewior [this message]
2013-05-22 21:08 ` [PATCH 3/7] input/i_am335x_tsc: removed unused variable in titsc_irq() Sebastian Andrzej Siewior
2013-05-22 21:44 ` Jonathan Cameron
2013-05-22 21:08 ` [PATCH 4/7] iio/ti_am335x_adc: remove the else case Sebastian Andrzej Siewior
2013-05-22 21:55 ` Jonathan Cameron
2013-05-31 7:43 ` Sebastian Andrzej Siewior
2013-05-22 21:08 ` [PATCH 6/7] mfd/ti_am335x_tscadc: remove platform_data support Sebastian Andrzej Siewior
2013-05-22 21:08 ` [PATCH 5/7] iio/ti_am335x_adc: " Sebastian Andrzej Siewior
2013-05-22 21:08 ` [PATCH 7/7] Documentation/DT bindings: add info for TI TSC ADC Sebastian Andrzej Siewior
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=1369256897-25984-2-git-send-email-bigeasy@linutronix.de \
--to=bigeasy-hfztesqfncyowbw4kg4ksq@public.gmane.org \
--cc=balbi-l0cyMroinI0@public.gmane.org \
--cc=dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org \
--cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=rachna-l0cyMroinI0@public.gmane.org \
--cc=sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
/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).