p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input: ti_am33x_tsc: remove platform_data support 

This patch removes access to platform data mfd_tscadc_board because the
platform is DT only.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior 2013-05-21 17:39:13 +02:00
parent 0396310b0e
commit b9194fdfa6
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/input/touchscreen/ti_am335x_tsc.c
View File

@ -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>
@ -347,24 +346,6 @@ static int titsc_parse_dt(struct platform_device *pdev,
ts_dev->config_inp, ARRAY_SIZE(ts_dev->config_inp));
}
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.
*/
@ -390,11 +371,7 @@ 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(pdev, ts_dev);
err = titsc_parse_dt(pdev, ts_dev);
if (err) {
dev_err(&pdev->dev, "Could not find valid DT data.\n");
goto err_free_mem;