Input: touchscreens - switch to using input_dev->dev.parent

In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 2f5fc80..693e3b2 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -899,7 +899,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
        input_dev->name = "ADS784x Touchscreen";
        input_dev->phys = ts->phys;
-       input_dev->cdev.dev = &spi->dev;
+       input_dev->dev.parent = &spi->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);

diff --cc drivers/input/touchscreen/corgi_ts.c
Simple merge

diff --cc drivers/input/touchscreen/elo.c
Simple merge

diff --cc drivers/input/touchscreen/gunze.c
Simple merge

diff --cc drivers/input/touchscreen/h3600_ts_input.c
Simple merge

diff --cc drivers/input/touchscreen/mtouch.c
Simple merge

diff --cc drivers/input/touchscreen/penmount.c
Simple merge

diff --cc drivers/input/touchscreen/touchright.c
Simple merge

diff --cc drivers/input/touchscreen/touchwin.c
Simple merge

diff --cc drivers/input/touchscreen/ucb1400_ts.c
Simple merge