diff options
Diffstat (limited to 'drivers/input/touchscreen/h3600_ts_input.c')
-rw-r--r-- | drivers/input/touchscreen/h3600_ts_input.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c index c4116d4f64e7..09ed7803cb8f 100644 --- a/drivers/input/touchscreen/h3600_ts_input.c +++ b/drivers/input/touchscreen/h3600_ts_input.c | |||
@@ -147,7 +147,7 @@ enum flite_pwr { | |||
147 | unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr) | 147 | unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr) |
148 | { | 148 | { |
149 | unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness; | 149 | unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness; |
150 | struct h3600_dev *ts = dev->private; | 150 | struct h3600_dev *ts = input_get_drvdata(dev); |
151 | 151 | ||
152 | /* Must be in this order */ | 152 | /* Must be in this order */ |
153 | ts->serio->write(ts->serio, 1); | 153 | ts->serio->write(ts->serio, 1); |
@@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type, | |||
260 | unsigned int code, int value) | 260 | unsigned int code, int value) |
261 | { | 261 | { |
262 | #if 0 | 262 | #if 0 |
263 | struct h3600_dev *ts = dev->private; | 263 | struct h3600_dev *ts = input_get_drvdata(dev); |
264 | 264 | ||
265 | switch (type) { | 265 | switch (type) { |
266 | case EV_LED: { | 266 | case EV_LED: { |
@@ -367,8 +367,9 @@ 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 | input_dev->private = ts; | 371 | |
372 | input_set_drvdata(input_dev, ts); | ||
372 | 373 | ||
373 | input_dev->event = h3600ts_event; | 374 | input_dev->event = h3600ts_event; |
374 | 375 | ||