Input: keyboards - switch to using input_dev->dev.parent

[pandora-kernel.git] / drivers / input / keyboard / xtkbd.c

diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index 0821d53..f3a56eb 100644 (file)
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -64,7 +64,7 @@ struct xtkbd {
 };
 
 static irqreturn_t xtkbd_interrupt(struct serio *serio,
-       unsigned char data, unsigned int flags, struct pt_regs *regs)
+       unsigned char data, unsigned int flags)
 {
        struct xtkbd *xtkbd = serio_get_drvdata(serio);
 
@@ -75,7 +75,6 @@ static irqreturn_t xtkbd_interrupt(struct serio *serio,
                default:
 
                        if (xtkbd->keycode[data & XTKBD_KEY]) {
-                               input_regs(xtkbd->dev, regs);
                                input_report_key(xtkbd->dev, xtkbd->keycode[data & XTKBD_KEY], !(data & XTKBD_RELEASE));
                                input_sync(xtkbd->dev);
                        } else {
@@ -96,7 +95,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
        xtkbd = kmalloc(sizeof(struct xtkbd), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!xtkbd || !input_dev)
-               goto fail;
+               goto fail1;
 
        xtkbd->serio = serio;
        xtkbd->dev = input_dev;
@@ -109,8 +108,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor  = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = xtkbd;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = xtkbd->keycode;
@@ -125,13 +123,17 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
 
        err = serio_open(serio, drv);
        if (err)
-               goto fail;
+               goto fail2;
+
+       err = input_register_device(xtkbd->dev);
+       if (err)
+               goto fail3;
 
-       input_register_device(xtkbd->dev);
        return 0;
 
- fail: serio_set_drvdata(serio, NULL);
-       input_free_device(input_dev);
+ fail3:        serio_close(serio);
+ fail2:        serio_set_drvdata(serio, NULL);
+ fail1:        input_free_device(input_dev);
        kfree(xtkbd);
        return err;
 }
@@ -171,8 +173,7 @@ static struct serio_driver xtkbd_drv = {
 
 static int __init xtkbd_init(void)
 {
-       serio_register_driver(&xtkbd_drv);
-       return 0;
+       return serio_register_driver(&xtkbd_drv);
 }
 
 static void __exit xtkbd_exit(void)