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 / serio / q40kbd.c

diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index 021763a..d3827c5 100644 (file)
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 2000-2001 Vojtech Pavlik
  *
  *  Based on the work of:
- *     Richard Zidlicky <Richard.Zidlicky@stud.informatik.uni-erlangen.de>     
+ *     Richard Zidlicky <Richard.Zidlicky@stud.informatik.uni-erlangen.de>
  */
 
 /*
@@ -35,8 +35,10 @@
 #include <linux/init.h>
 #include <linux/serio.h>
 #include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/bitops.h>
+#include <linux/platform_device.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/q40_master.h>
@@ -47,66 +49,140 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver");
 MODULE_LICENSE("GPL");
 
+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)
+{
+       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);
+
+       master_outb(-1, KEYBOARD_UNLOCK_REG);
+
+       spin_unlock_irqrestore(&q40kbd_lock, flags);
+
+       return IRQ_HANDLED;
+}
+
+/*
+ * q40kbd_flush() flushes all data that may be in the keyboard buffers
+ */
+
+static void q40kbd_flush(void)
+{
+       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);
+
+       spin_unlock_irqrestore(&q40kbd_lock, flags);
+}
+
+/*
+ * q40kbd_open() is called when a port is open by the higher layer.
+ * It allocates the interrupt and enables in in the chip.
+ */
 
 static int q40kbd_open(struct serio *port)
 {
+       q40kbd_flush();
+
+       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 -EBUSY;
+       }
+
+       /* off we go */
+       master_outb(-1, KEYBOARD_UNLOCK_REG);
+       master_outb(1, KEY_IRQ_ENABLE_REG);
+
        return 0;
 }
+
 static void q40kbd_close(struct serio *port)
 {
+       master_outb(0, KEY_IRQ_ENABLE_REG);
+       master_outb(-1, KEYBOARD_UNLOCK_REG);
+       free_irq(Q40_IRQ_KEYBOARD, NULL);
+
+       q40kbd_flush();
 }
 
-static struct serio q40kbd_port =
+static int __devinit q40kbd_probe(struct platform_device *dev)
 {
-       .type   = SERIO_8042,
-       .name   = "Q40 kbd port",
-       .phys   = "Q40",
-       .write  = NULL,
-       .open   = q40kbd_open,
-       .close  = q40kbd_close,
-};
+       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");
 
-static irqreturn_t q40kbd_interrupt(int irq, void *dev_id,
-                                   struct pt_regs *regs)
+       return 0;
+}
+
+static int __devexit q40kbd_remove(struct platform_device *dev)
 {
-       if (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG))
-               serio_interrupt(&q40kbd_port, master_inb(KEYCODE_REG), 0, regs);
+       serio_unregister_port(q40kbd_port);
 
-       master_outb(-1, KEYBOARD_UNLOCK_REG);
-       return IRQ_HANDLED;
+       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 maxread = 100;
+       int error;
 
        if (!MACH_IS_Q40)
                return -EIO;
 
-       /* allocate the IRQ */
-       request_irq(Q40_IRQ_KEYBOARD, q40kbd_interrupt, 0, "q40kbd", NULL);
+       error = platform_driver_register(&q40kbd_driver);
+       if (error)
+               return error;
 
-       /* flush any pending input */
-       while (maxread-- && (Q40_IRQ_KEYB_MASK & master_inb(INTERRUPT_REG)))
-               master_inb(KEYCODE_REG);
+       q40kbd_device = platform_device_alloc("q40kbd", -1);
+       if (!q40kbd_device)
+               goto err_unregister_driver;
 
-       /* off we go */
-       master_outb(-1,KEYBOARD_UNLOCK_REG);
-       master_outb(1,KEY_IRQ_ENABLE_REG);
-
-       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)
 {
-       master_outb(0,KEY_IRQ_ENABLE_REG);
-       master_outb(-1,KEYBOARD_UNLOCK_REG);
-
-       serio_unregister_port(&q40kbd_port);
-       free_irq(Q40_IRQ_KEYBOARD, NULL);
+       platform_device_unregister(q40kbd_device);
+       platform_driver_unregister(&q40kbd_driver);
 }
 
 module_init(q40kbd_init);