Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / drivers / input / touchscreen / h3600_ts_input.c

diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index c4116d4f64e7ae5d85424dfa0cb02c450b758b84..2ae6c6016a8665d79eb4f6dd63d76a3675230f30 100644 (file)
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -147,7 +147,7 @@ enum flite_pwr {
 unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
 {
        unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness;
-       struct h3600_dev *ts = dev->private;
+       struct h3600_dev *ts = input_get_drvdata(dev);
 
        /* Must be in this order */
        ts->serio->write(ts->serio, 1);
@@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type,
                         unsigned int code, int value)
 {
 #if 0
-       struct h3600_dev *ts = dev->private;
+       struct h3600_dev *ts = input_get_drvdata(dev);
 
        switch (type) {
                case EV_LED: {
@@ -367,13 +367,15 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_H3600;
        input_dev->id.product = 0x0666;  /* FIXME !!! We can ask the hardware */
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = ts;
+       input_dev->dev.parent = &serio->dev;
+
+       input_set_drvdata(input_dev, ts);
 
        input_dev->event = h3600ts_event;
 
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_LED) | BIT(EV_PWR);
-       input_dev->ledbit[0] = BIT(LED_SLEEP);
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
+               BIT_MASK(EV_LED) | BIT_MASK(EV_PWR);
+       input_dev->ledbit[0] = BIT_MASK(LED_SLEEP);
        input_set_abs_params(input_dev, ABS_X, 60, 985, 0, 0);
        input_set_abs_params(input_dev, ABS_Y, 35, 1024, 0, 0);