diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/corgi_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/elo.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/gunze.c | 1 | ||||
-rw-r--r-- | drivers/input/touchscreen/h3600_ts_input.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/mtouch.c | 1 | ||||
-rw-r--r-- | drivers/input/touchscreen/penmount.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/touchright.c | 1 | ||||
-rw-r--r-- | drivers/input/touchscreen/touchwin.c | 1 | ||||
-rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 2 |
10 files changed, 10 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 2f5fc8043366..693e3b2a65a3 100644 --- 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) | |||
899 | 899 | ||
900 | input_dev->name = "ADS784x Touchscreen"; | 900 | input_dev->name = "ADS784x Touchscreen"; |
901 | input_dev->phys = ts->phys; | 901 | input_dev->phys = ts->phys; |
902 | input_dev->cdev.dev = &spi->dev; | 902 | input_dev->dev.parent = &spi->dev; |
903 | 903 | ||
904 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 904 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
905 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 905 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c index 4965c0519470..e6a31d118786 100644 --- a/drivers/input/touchscreen/corgi_ts.c +++ b/drivers/input/touchscreen/corgi_ts.c | |||
@@ -300,7 +300,7 @@ static int __init corgits_probe(struct platform_device *pdev) | |||
300 | input_dev->id.vendor = 0x0001; | 300 | input_dev->id.vendor = 0x0001; |
301 | input_dev->id.product = 0x0002; | 301 | input_dev->id.product = 0x0002; |
302 | input_dev->id.version = 0x0100; | 302 | input_dev->id.version = 0x0100; |
303 | input_dev->cdev.dev = &pdev->dev; | 303 | input_dev->dev.parent = &pdev->dev; |
304 | 304 | ||
305 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 305 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
306 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 306 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c index 7e2f326fb008..557d781719f1 100644 --- a/drivers/input/touchscreen/elo.c +++ b/drivers/input/touchscreen/elo.c | |||
@@ -318,7 +318,7 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv) | |||
318 | input_dev->id.vendor = SERIO_ELO; | 318 | input_dev->id.vendor = SERIO_ELO; |
319 | input_dev->id.product = elo->id; | 319 | input_dev->id.product = elo->id; |
320 | input_dev->id.version = 0x0100; | 320 | input_dev->id.version = 0x0100; |
321 | input_dev->cdev.dev = &serio->dev; | 321 | input_dev->dev.parent = &serio->dev; |
322 | 322 | ||
323 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 323 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
324 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 324 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c index 399eb4a834a4..39d602600d7c 100644 --- a/drivers/input/touchscreen/gunze.c +++ b/drivers/input/touchscreen/gunze.c | |||
@@ -136,6 +136,7 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv) | |||
136 | input_dev->id.vendor = SERIO_GUNZE; | 136 | input_dev->id.vendor = SERIO_GUNZE; |
137 | input_dev->id.product = 0x0051; | 137 | input_dev->id.product = 0x0051; |
138 | input_dev->id.version = 0x0100; | 138 | input_dev->id.version = 0x0100; |
139 | input_dev->dev.parent = &serio->dev; | ||
139 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 140 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
140 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 141 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
141 | input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0); | 142 | input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0); |
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c index 2b01acec326c..09ed7803cb8f 100644 --- a/drivers/input/touchscreen/h3600_ts_input.c +++ b/drivers/input/touchscreen/h3600_ts_input.c | |||
@@ -367,7 +367,7 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv) | |||
367 | input_dev->id.vendor = SERIO_H3600; | 367 | input_dev->id.vendor = SERIO_H3600; |
368 | input_dev->id.product = 0x0666; /* FIXME !!! We can ask the hardware */ | 368 | input_dev->id.product = 0x0666; /* FIXME !!! We can ask the hardware */ |
369 | input_dev->id.version = 0x0100; | 369 | input_dev->id.version = 0x0100; |
370 | input_dev->cdev.dev = &serio->dev; | 370 | input_dev->dev.parent = &serio->dev; |
371 | 371 | ||
372 | input_set_drvdata(input_dev, ts); | 372 | input_set_drvdata(input_dev, ts); |
373 | 373 | ||
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c index 53b0683556be..4ec3b1f940c8 100644 --- a/drivers/input/touchscreen/mtouch.c +++ b/drivers/input/touchscreen/mtouch.c | |||
@@ -150,6 +150,7 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv) | |||
150 | input_dev->id.vendor = SERIO_MICROTOUCH; | 150 | input_dev->id.vendor = SERIO_MICROTOUCH; |
151 | input_dev->id.product = 0; | 151 | input_dev->id.product = 0; |
152 | input_dev->id.version = 0x0100; | 152 | input_dev->id.version = 0x0100; |
153 | input_dev->dev.parent = &serio->dev; | ||
153 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 154 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
154 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 155 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
155 | input_set_abs_params(mtouch->dev, ABS_X, MTOUCH_MIN_XC, MTOUCH_MAX_XC, 0, 0); | 156 | input_set_abs_params(mtouch->dev, ABS_X, MTOUCH_MIN_XC, MTOUCH_MAX_XC, 0, 0); |
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c index 65a4e0ac69a8..f2c0d3c7149c 100644 --- a/drivers/input/touchscreen/penmount.c +++ b/drivers/input/touchscreen/penmount.c | |||
@@ -111,7 +111,7 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv) | |||
111 | input_dev->id.vendor = SERIO_PENMOUNT; | 111 | input_dev->id.vendor = SERIO_PENMOUNT; |
112 | input_dev->id.product = 0; | 112 | input_dev->id.product = 0; |
113 | input_dev->id.version = 0x0100; | 113 | input_dev->id.version = 0x0100; |
114 | input_dev->cdev.dev = &serio->dev; | 114 | input_dev->dev.parent = &serio->dev; |
115 | 115 | ||
116 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 116 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
117 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 117 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c index 63d2d4491001..3def7bb1df44 100644 --- a/drivers/input/touchscreen/touchright.c +++ b/drivers/input/touchscreen/touchright.c | |||
@@ -124,6 +124,7 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv) | |||
124 | input_dev->id.vendor = SERIO_TOUCHRIGHT; | 124 | input_dev->id.vendor = SERIO_TOUCHRIGHT; |
125 | input_dev->id.product = 0; | 125 | input_dev->id.product = 0; |
126 | input_dev->id.version = 0x0100; | 126 | input_dev->id.version = 0x0100; |
127 | input_dev->dev.parent = &serio->dev; | ||
127 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 128 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
128 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 129 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
129 | input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0); | 130 | input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0); |
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c index 3da9c8c3f156..ac4bdcf18666 100644 --- a/drivers/input/touchscreen/touchwin.c +++ b/drivers/input/touchscreen/touchwin.c | |||
@@ -131,6 +131,7 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv) | |||
131 | input_dev->id.vendor = SERIO_TOUCHWIN; | 131 | input_dev->id.vendor = SERIO_TOUCHWIN; |
132 | input_dev->id.product = 0; | 132 | input_dev->id.product = 0; |
133 | input_dev->id.version = 0x0100; | 133 | input_dev->id.version = 0x0100; |
134 | input_dev->dev.parent = &serio->dev; | ||
134 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 135 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
135 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 136 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
136 | input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0); | 137 | input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0); |
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index fe4bdf683d1d..5200f4cbfe01 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -509,7 +509,7 @@ static int ucb1400_ts_probe(struct device *dev) | |||
509 | 509 | ||
510 | input_set_drvdata(idev, ucb); | 510 | input_set_drvdata(idev, ucb); |
511 | 511 | ||
512 | idev->cdev.dev = dev; | 512 | idev->dev.parent = dev; |
513 | idev->name = "UCB1400 touchscreen interface"; | 513 | idev->name = "UCB1400 touchscreen interface"; |
514 | idev->id.vendor = ucb1400_reg_read(ucb, AC97_VENDOR_ID1); | 514 | idev->id.vendor = ucb1400_reg_read(ucb, AC97_VENDOR_ID1); |
515 | idev->id.product = id; | 515 | idev->id.product = id; |