fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / input / serio / ambakmi.c

diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 6a780c1..5a7b49c 100644 (file)
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -19,32 +19,32 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/kmi.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/amba_kmi.h>
-#include <asm/hardware/clock.h>
 
 #define KMI_BASE       (kmi->base)
 
 struct amba_kmi_port {
-       struct serio            io;
+       struct serio            *io;
        struct clk              *clk;
-       unsigned char           *base;
+       void __iomem            *base;
        unsigned int            irq;
        unsigned int            divisor;
        unsigned int            open;
 };
 
-static irqreturn_t amba_kmi_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t amba_kmi_int(int irq, void *dev_id)
 {
        struct amba_kmi_port *kmi = dev_id;
        unsigned int status = readb(KMIIR);
        int handled = IRQ_NONE;
 
        while (status & KMIIR_RXINTR) {
-               serio_interrupt(&kmi->io, readb(KMIDATA), 0, regs);
+               serio_interrupt(kmi->io, readb(KMIDATA), 0);
                status = readb(KMIIR);
                handled = IRQ_HANDLED;
        }
@@ -54,7 +54,7 @@ static irqreturn_t amba_kmi_int(int irq, void *dev_id, struct pt_regs *regs)
 
 static int amba_kmi_write(struct serio *io, unsigned char val)
 {
-       struct amba_kmi_port *kmi = io->driver;
+       struct amba_kmi_port *kmi = io->port_data;
        unsigned int timeleft = 10000; /* timeout in 100ms */
 
        while ((readb(KMISTAT) & KMISTAT_TXEMPTY) == 0 && timeleft--)
@@ -68,17 +68,13 @@ static int amba_kmi_write(struct serio *io, unsigned char val)
 
 static int amba_kmi_open(struct serio *io)
 {
-       struct amba_kmi_port *kmi = io->driver;
+       struct amba_kmi_port *kmi = io->port_data;
        unsigned int divisor;
        int ret;
 
-       ret = clk_use(kmi->clk);
-       if (ret)
-               goto out;
-
        ret = clk_enable(kmi->clk);
        if (ret)
-               goto clk_unuse;
+               goto out;
 
        divisor = clk_get_rate(kmi->clk) / 8000000 - 1;
        writeb(divisor, KMICLKDIV);
@@ -97,26 +93,24 @@ static int amba_kmi_open(struct serio *io)
 
  clk_disable:
        clk_disable(kmi->clk);
- clk_unuse:
-       clk_unuse(kmi->clk);
  out:
        return ret;
 }
 
 static void amba_kmi_close(struct serio *io)
 {
-       struct amba_kmi_port *kmi = io->driver;
+       struct amba_kmi_port *kmi = io->port_data;
 
        writeb(0, KMICR);
 
        free_irq(kmi->irq, kmi);
        clk_disable(kmi->clk);
-       clk_unuse(kmi->clk);
 }
 
 static int amba_kmi_probe(struct amba_device *dev, void *id)
 {
        struct amba_kmi_port *kmi;
+       struct serio *io;
        int ret;
 
        ret = amba_request_regions(dev, NULL);
@@ -124,21 +118,25 @@ static int amba_kmi_probe(struct amba_device *dev, void *id)
                return ret;
 
        kmi = kmalloc(sizeof(struct amba_kmi_port), GFP_KERNEL);
-       if (!kmi) {
+       io = kmalloc(sizeof(struct serio), GFP_KERNEL);
+       if (!kmi || !io) {
                ret = -ENOMEM;
                goto out;
        }
 
        memset(kmi, 0, sizeof(struct amba_kmi_port));
-
-       kmi->io.type    = SERIO_8042;
-       kmi->io.write   = amba_kmi_write;
-       kmi->io.open    = amba_kmi_open;
-       kmi->io.close   = amba_kmi_close;
-       kmi->io.name    = dev->dev.bus_id;
-       kmi->io.phys    = dev->dev.bus_id;
-       kmi->io.driver  = kmi;
-
+       memset(io, 0, sizeof(struct serio));
+
+       io->id.type     = SERIO_8042;
+       io->write       = amba_kmi_write;
+       io->open        = amba_kmi_open;
+       io->close       = amba_kmi_close;
+       strlcpy(io->name, dev->dev.bus_id, sizeof(io->name));
+       strlcpy(io->phys, dev->dev.bus_id, sizeof(io->phys));
+       io->port_data   = kmi;
+       io->dev.parent  = &dev->dev;
+
+       kmi->io         = io;
        kmi->base       = ioremap(dev->res.start, KMI_SIZE);
        if (!kmi->base) {
                ret = -ENOMEM;
@@ -154,13 +152,14 @@ static int amba_kmi_probe(struct amba_device *dev, void *id)
        kmi->irq = dev->irq[0];
        amba_set_drvdata(dev, kmi);
 
-       serio_register_port(&kmi->io);
+       serio_register_port(kmi->io);
        return 0;
 
  unmap:
        iounmap(kmi->base);
  out:
        kfree(kmi);
+       kfree(io);
        amba_release_regions(dev);
        return ret;
 }
@@ -171,7 +170,7 @@ static int amba_kmi_remove(struct amba_device *dev)
 
        amba_set_drvdata(dev, NULL);
 
-       serio_unregister_port(&kmi->io);
+       serio_unregister_port(kmi->io);
        clk_put(kmi->clk);
        iounmap(kmi->base);
        kfree(kmi);
@@ -184,7 +183,7 @@ static int amba_kmi_resume(struct amba_device *dev)
        struct amba_kmi_port *kmi = amba_get_drvdata(dev);
 
        /* kick the serio layer to rescan this port */
-       serio_rescan(&kmi->io);
+       serio_reconnect(kmi->io);
 
        return 0;
 }
@@ -214,7 +213,7 @@ static int __init amba_kmi_init(void)
 
 static void __exit amba_kmi_exit(void)
 {
-       return amba_driver_unregister(&ambakmi_driver);
+       amba_driver_unregister(&ambakmi_driver);
 }
 
 module_init(amba_kmi_init);