Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[pandora-kernel.git] / drivers / input / serio / q40kbd.c

diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index b44d255..e36a090 100644 (file)
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -1,6 +1,4 @@
 /*
- * $Id: q40kbd.c,v 1.12 2002/02/02 22:26:44 vojtech Exp $
- *
  *  Copyright (c) 2000-2001 Vojtech Pavlik
  *
  *  Based on the work of:
@@ -49,18 +47,18 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver");
 MODULE_LICENSE("GPL");
 
-DEFINE_SPINLOCK(q40kbd_lock);
+static DEFINE_SPINLOCK(q40kbd_lock);
 static struct serio *q40kbd_port;
 static struct platform_device *q40kbd_device;
 
-static irqreturn_t q40kbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t q40kbd_interrupt(int irq, void *dev_id)
 {
        unsigned long flags;
 
        spin_lock_irqsave(&q40kbd_lock, flags);
 
        if (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG))
-               serio_interrupt(q40kbd_port, master_inb(KEYCODE_REG), 0, regs);
+               serio_interrupt(q40kbd_port, master_inb(KEYCODE_REG), 0);
 
        master_outb(-1, KEYBOARD_UNLOCK_REG);
 
@@ -75,13 +73,13 @@ static irqreturn_t q40kbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static void q40kbd_flush(void)
 {
-       int maxread = 100;
+       int maxread = 100;
        unsigned long flags;
 
        spin_lock_irqsave(&q40kbd_lock, flags);
 
-       while (maxread-- && (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG)))
-               master_inb(KEYCODE_REG);
+       while (maxread-- && (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG)))
+               master_inb(KEYCODE_REG);
 
        spin_unlock_irqrestore(&q40kbd_lock, flags);
 }
@@ -97,14 +95,14 @@ static int q40kbd_open(struct serio *port)
 
        if (request_irq(Q40_IRQ_KEYBOARD, q40kbd_interrupt, 0, "q40kbd", NULL)) {
                printk(KERN_ERR "q40kbd.c: Can't get irq %d.\n", Q40_IRQ_KEYBOARD);
-               return -1;
+               return -EBUSY;
        }
 
-       /* off we go */
-       master_outb(-1, KEYBOARD_UNLOCK_REG);
-       master_outb(1, KEY_IRQ_ENABLE_REG);
+       /* off we go */
+       master_outb(-1, KEYBOARD_UNLOCK_REG);
+       master_outb(1, KEY_IRQ_ENABLE_REG);
 
-       return 0;
+       return 0;
 }
 
 static void q40kbd_close(struct serio *port)
@@ -116,48 +114,73 @@ static void q40kbd_close(struct serio *port)
        q40kbd_flush();
 }
 
-static struct serio * __init q40kbd_allocate_port(void)
+static int __devinit q40kbd_probe(struct platform_device *dev)
 {
-       struct serio *serio;
-
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
-       if (serio) {
-               memset(serio, 0, sizeof(struct serio));
-               serio->id.type          = SERIO_8042;
-               serio->open             = q40kbd_open;
-               serio->close            = q40kbd_close;
-               serio->dev.parent       = &q40kbd_device->dev;
-               strlcpy(serio->name, "Q40 Kbd Port", sizeof(serio->name));
-               strlcpy(serio->phys, "Q40", sizeof(serio->phys));
-       }
+       q40kbd_port = kzalloc(sizeof(struct serio), GFP_KERNEL);
+       if (!q40kbd_port)
+               return -ENOMEM;
+
+       q40kbd_port->id.type    = SERIO_8042;
+       q40kbd_port->open       = q40kbd_open;
+       q40kbd_port->close      = q40kbd_close;
+       q40kbd_port->dev.parent = &dev->dev;
+       strlcpy(q40kbd_port->name, "Q40 Kbd Port", sizeof(q40kbd_port->name));
+       strlcpy(q40kbd_port->phys, "Q40", sizeof(q40kbd_port->phys));
+
+       serio_register_port(q40kbd_port);
+       printk(KERN_INFO "serio: Q40 kbd registered\n");
+
+       return 0;
+}
 
-       return serio;
+static int __devexit q40kbd_remove(struct platform_device *dev)
+{
+       serio_unregister_port(q40kbd_port);
+
+       return 0;
 }
 
+static struct platform_driver q40kbd_driver = {
+       .driver         = {
+               .name   = "q40kbd",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = q40kbd_probe,
+       .remove         = __devexit_p(q40kbd_remove),
+};
+
 static int __init q40kbd_init(void)
 {
+       int error;
+
        if (!MACH_IS_Q40)
-               return -EIO;
+               return -ENODEV;
 
-       q40kbd_device = platform_device_register_simple("q40kbd", -1, NULL, 0);
-       if (IS_ERR(q40kbd_device))
-               return PTR_ERR(q40kbd_device);
+       error = platform_driver_register(&q40kbd_driver);
+       if (error)
+               return error;
 
-       if (!(q40kbd_port = q40kbd_allocate_port())) {
-               platform_device_unregister(q40kbd_device);
-               return -ENOMEM;
-       }
+       q40kbd_device = platform_device_alloc("q40kbd", -1);
+       if (!q40kbd_device)
+               goto err_unregister_driver;
 
-       serio_register_port(q40kbd_port);
-       printk(KERN_INFO "serio: Q40 kbd registered\n");
+       error = platform_device_add(q40kbd_device);
+       if (error)
+               goto err_free_device;
 
        return 0;
+
+ err_free_device:
+       platform_device_put(q40kbd_device);
+ err_unregister_driver:
+       platform_driver_unregister(&q40kbd_driver);
+       return error;
 }
 
 static void __exit q40kbd_exit(void)
 {
-       serio_unregister_port(q40kbd_port);
        platform_device_unregister(q40kbd_device);
+       platform_driver_unregister(&q40kbd_driver);
 }
 
 module_init(q40kbd_init);