]> git.karo-electronics.de Git - linux-beck.git/commitdiff
input: ti_am33x_tsc: remove platform_data support
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Tue, 21 May 2013 15:39:13 +0000 (17:39 +0200)
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>
Wed, 12 Jun 2013 16:36:30 +0000 (18:36 +0200)
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>
drivers/input/touchscreen/ti_am335x_tsc.c

index 449c0fbbe1d6370bb2cc3a50b4a53e1dfd9dca45..a1db55d1a8629a26954d0f078dd955dfce60b7dd 100644 (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;