Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / input / touchscreen / hp680_ts_input.c

diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 7e14044..957dd5a 100644 (file)
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -21,10 +21,8 @@
 
 static void do_softint(void *data);
 
-static struct input_dev hp680_ts_dev;
+static struct input_dev *hp680_ts_dev;
 static DECLARE_WORK(work, do_softint, 0);
-static char *hp680_ts_name = "HP Jornada touchscreen";
-static char *hp680_ts_phys = "input0";
 
 static void do_softint(void *data)
 {
@@ -58,14 +56,14 @@ static void do_softint(void *data)
        }
 
        if (touched) {
-               input_report_key(&hp680_ts_dev, BTN_TOUCH, 1);
-               input_report_abs(&hp680_ts_dev, ABS_X, absx);
-               input_report_abs(&hp680_ts_dev, ABS_Y, absy);
+               input_report_key(hp680_ts_dev, BTN_TOUCH, 1);
+               input_report_abs(hp680_ts_dev, ABS_X, absx);
+               input_report_abs(hp680_ts_dev, ABS_Y, absy);
        } else {
-               input_report_key(&hp680_ts_dev, BTN_TOUCH, 0);
+               input_report_key(hp680_ts_dev, BTN_TOUCH, 0);
        }
 
-       input_sync(&hp680_ts_dev);
+       input_sync(hp680_ts_dev);
        enable_irq(HP680_TS_IRQ);
 }
 
@@ -92,27 +90,29 @@ static int __init hp680_ts_init(void)
        scpcr |= SCPCR_TS_ENABLE;
        ctrl_outw(scpcr, SCPCR);
 
-       memset(&hp680_ts_dev, 0, sizeof(hp680_ts_dev));
-       init_input_dev(&hp680_ts_dev);
+       hp680_ts_dev = input_allocate_device();
+       if (!hp680_ts_dev)
+               return -ENOMEM;
 
-       hp680_ts_dev.evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
-       hp680_ts_dev.absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
-       hp680_ts_dev.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       hp680_ts_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+       hp680_ts_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
+       hp680_ts_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
 
-       hp680_ts_dev.absmin[ABS_X] = HP680_TS_ABS_X_MIN;
-       hp680_ts_dev.absmin[ABS_Y] = HP680_TS_ABS_Y_MIN;
-       hp680_ts_dev.absmax[ABS_X] = HP680_TS_ABS_X_MAX;
-       hp680_ts_dev.absmax[ABS_Y] = HP680_TS_ABS_Y_MAX;
+       hp680_ts_dev->absmin[ABS_X] = HP680_TS_ABS_X_MIN;
+       hp680_ts_dev->absmin[ABS_Y] = HP680_TS_ABS_Y_MIN;
+       hp680_ts_dev->absmax[ABS_X] = HP680_TS_ABS_X_MAX;
+       hp680_ts_dev->absmax[ABS_Y] = HP680_TS_ABS_Y_MAX;
 
-       hp680_ts_dev.name = hp680_ts_name;
-       hp680_ts_dev.phys = hp680_ts_phys;
-       input_register_device(&hp680_ts_dev);
+       hp680_ts_dev->name = "HP Jornada touchscreen";
+       hp680_ts_dev->phys = "hp680_ts/input0";
 
-       if (request_irq
-           (HP680_TS_IRQ, hp680_ts_interrupt, SA_INTERRUPT, MODNAME, 0) < 0) {
-               printk(KERN_ERR "hp680_touchscreen.c : Can't allocate irq %d\n",
+       input_register_device(hp680_ts_dev);
+
+       if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
+                       SA_INTERRUPT, MODNAME, 0) < 0) {
+               printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
                       HP680_TS_IRQ);
-               input_unregister_device(&hp680_ts_dev);
+               input_unregister_device(hp680_ts_dev);
                return -EBUSY;
        }
 
@@ -124,7 +124,7 @@ static void __exit hp680_ts_exit(void)
        free_irq(HP680_TS_IRQ, 0);
        cancel_delayed_work(&work);
        flush_scheduled_work();
-       input_unregister_device(&hp680_ts_dev);
+       input_unregister_device(hp680_ts_dev);
 }
 
 module_init(hp680_ts_init);