Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[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..2490874 100644 (file)
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -6,7 +6,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/adc.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
 
 #define MODNAME "hp680_ts_input"
 
@@ -15,16 +15,13 @@
 #define HP680_TS_ABS_Y_MIN     80
 #define HP680_TS_ABS_Y_MAX     910
 
-#define        SCPCR   0xa4000116
 #define        PHDR    0xa400012e
 #define SCPDR  0xa4000136
 
 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,18 +55,18 @@ 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);
 }
 
-static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t hp680_ts_interrupt(int irq, void *dev)
 {
        disable_irq_nosync(irq);
        schedule_delayed_work(&work, HZ / 20);
@@ -79,52 +76,50 @@ static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs)
 
 static int __init hp680_ts_init(void)
 {
-       u8 scpdr;
-       u16 scpcr;
-
-       scpdr = ctrl_inb(SCPDR);
-       scpdr |= SCPDR_TS_SCAN_X | SCPDR_TS_SCAN_Y;
-       scpdr &= ~SCPDR_TS_SCAN_ENABLE;
-       ctrl_outb(scpdr, SCPDR);
+       int err;
 
-       scpcr = ctrl_inw(SCPCR);
-       scpcr &= ~SCPCR_TS_MASK;
-       scpcr |= SCPCR_TS_ENABLE;
-       ctrl_outw(scpcr, SCPCR);
+       hp680_ts_dev = input_allocate_device();
+       if (!hp680_ts_dev)
+               return -ENOMEM;
 
-       memset(&hp680_ts_dev, 0, sizeof(hp680_ts_dev));
-       init_input_dev(&hp680_ts_dev);
+       hp680_ts_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+       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);
+       input_set_abs_params(hp680_ts_dev, ABS_X,
+               HP680_TS_ABS_X_MIN, HP680_TS_ABS_X_MAX, 0, 0);
+       input_set_abs_params(hp680_ts_dev, ABS_Y,
+               HP680_TS_ABS_Y_MIN, HP680_TS_ABS_Y_MAX, 0, 0);
 
-       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 = "HP Jornada touchscreen";
+       hp680_ts_dev->phys = "hp680_ts/input0";
 
-       hp680_ts_dev.name = hp680_ts_name;
-       hp680_ts_dev.phys = hp680_ts_phys;
-       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",
+       if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
+                       IRQF_DISABLED, MODNAME, 0) < 0) {
+               printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
                       HP680_TS_IRQ);
-               input_unregister_device(&hp680_ts_dev);
-               return -EBUSY;
+               err = -EBUSY;
+               goto fail1;
        }
 
+       err = input_register_device(hp680_ts_dev);
+       if (err)
+               goto fail2;
+
        return 0;
+
+ fail2:        free_irq(HP680_TS_IRQ, NULL);
+       cancel_delayed_work(&work);
+       flush_scheduled_work();
+ fail1:        input_free_device(hp680_ts_dev);
+       return err;
 }
 
 static void __exit hp680_ts_exit(void)
 {
-       free_irq(HP680_TS_IRQ, 0);
+       free_irq(HP680_TS_IRQ, NULL);
        cancel_delayed_work(&work);
        flush_scheduled_work();
-       input_unregister_device(&hp680_ts_dev);
+       input_unregister_device(hp680_ts_dev);
 }
 
 module_init(hp680_ts_init);