Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6] / drivers / input / keyboard / stowaway.c

diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c
index 04c54c57f25c6f0bf661cd3d5273238c39f195f8..b44b0684d5439e7e18ce620f5fe65a6962997261 100644 (file)
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -71,13 +71,12 @@ struct skbd {
 };
 
 static irqreturn_t skbd_interrupt(struct serio *serio, unsigned char data,
-                                 unsigned int flags, struct pt_regs *regs)
+                                 unsigned int flags)
 {
        struct skbd *skbd = serio_get_drvdata(serio);
        struct input_dev *dev = skbd->dev;
 
        if (skbd->keycode[data & SKBD_KEY_MASK]) {
-               input_regs(dev, regs);
                input_report_key(dev, skbd->keycode[data & SKBD_KEY_MASK],
                                 !(data & SKBD_RELEASE));
                input_sync(dev);
@@ -109,8 +108,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_STOWAWAY;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = skbd;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = skbd->keycode;
@@ -174,8 +172,7 @@ static struct serio_driver skbd_drv = {
 
 static int __init skbd_init(void)
 {
-       serio_register_driver(&skbd_drv);
-       return 0;
+       return serio_register_driver(&skbd_drv);
 }
 
 static void __exit skbd_exit(void)