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 / maceps2.c

diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index 78f4d9b..f08a5d0 100644 (file)
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/err.h>
@@ -62,8 +62,8 @@ static int maceps2_write(struct serio *dev, unsigned char val)
        unsigned int timeout = MACE_PS2_TIMEOUT;
 
        do {
-               if (mace_read(port->status) & PS2_STATUS_TX_EMPTY) {
-                       mace_write(val, port->tx);
+               if (port->status & PS2_STATUS_TX_EMPTY) {
+                       port->tx = val;
                        return 0;
                }
                udelay(50);
@@ -72,14 +72,15 @@ static int maceps2_write(struct serio *dev, unsigned char val)
        return -1;
 }
 
-static irqreturn_t maceps2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t maceps2_interrupt(int irq, void *dev_id,
+                                    struct pt_regs *regs)
 {
        struct serio *dev = dev_id;
        struct mace_ps2port *port = ((struct maceps2_data *)dev->port_data)->port;
-       unsigned int byte;
+       unsigned long byte;
 
-       if (mace_read(port->status) & PS2_STATUS_RX_FULL) {
-               byte = mace_read(port->rx);
+       if (port->status & PS2_STATUS_RX_FULL) {
+               byte = port->rx;
                serio_interrupt(dev, byte & 0xff, 0, regs);
         }
 
@@ -90,19 +91,19 @@ static int maceps2_open(struct serio *dev)
 {
        struct maceps2_data *data = (struct maceps2_data *)dev->port_data;
 
-       if (request_irq(data->irq, maceps2_interrupt, 0, "PS/2 port", dev)) {
+       if (request_irq(data->irq, maceps2_interrupt, 0, "PS2 port", dev)) {
                printk(KERN_ERR "Could not allocate PS/2 IRQ\n");
                return -EBUSY;
        }
 
        /* Reset port */
-       mace_write(PS2_CONTROL_TX_CLOCK_DISABLE | PS2_CONTROL_RESET,
-                  data->port->control);
+       data->port->control = PS2_CONTROL_TX_CLOCK_DISABLE | PS2_CONTROL_RESET;
        udelay(100);
 
         /* Enable interrupts */
-       mace_write(PS2_CONTROL_RX_CLOCK_ENABLE | PS2_CONTROL_TX_ENABLE |
-                  PS2_CONTROL_RX_INT_ENABLE, data->port->control);
+       data->port->control = PS2_CONTROL_RX_CLOCK_ENABLE |
+                             PS2_CONTROL_TX_ENABLE |
+                             PS2_CONTROL_RX_INT_ENABLE;
 
        return 0;
 }
@@ -111,21 +112,19 @@ static void maceps2_close(struct serio *dev)
 {
        struct maceps2_data *data = (struct maceps2_data *)dev->port_data;
 
-       mace_write(PS2_CONTROL_TX_CLOCK_DISABLE | PS2_CONTROL_RESET,
-                  data->port->control);
+       data->port->control = PS2_CONTROL_TX_CLOCK_DISABLE | PS2_CONTROL_RESET;
        udelay(100);
        free_irq(data->irq, dev);
 }
 
 
-static struct serio * __init maceps2_allocate_port(int idx)
+static struct serio * __devinit maceps2_allocate_port(int idx)
 {
        struct serio *serio;
 
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+       serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (serio) {
-               memset(serio, 0, sizeof(struct serio));
-               serio->type             = SERIO_8042;
+               serio->id.type          = SERIO_8042;
                serio->write            = maceps2_write;
                serio->open             = maceps2_open;
                serio->close            = maceps2_close;
@@ -138,24 +137,13 @@ static struct serio * __init maceps2_allocate_port(int idx)
        return serio;
 }
 
-
-static int __init maceps2_init(void)
+static int __devinit maceps2_probe(struct platform_device *dev)
 {
-       maceps2_device = platform_device_register_simple("maceps2", -1, NULL, 0);
-       if (IS_ERR(maceps2_device))
-               return PTR_ERR(maceps2_device);
-
-       port_data[0].port = &mace->perif.ps2.keyb;
-       port_data[0].irq  = MACEISA_KEYB_IRQ;
-       port_data[1].port = &mace->perif.ps2.mouse;
-       port_data[1].irq  = MACEISA_MOUSE_IRQ;
-
        maceps2_port[0] = maceps2_allocate_port(0);
        maceps2_port[1] = maceps2_allocate_port(1);
        if (!maceps2_port[0] || !maceps2_port[1]) {
                kfree(maceps2_port[0]);
                kfree(maceps2_port[1]);
-               platform_device_unregister(maceps2_device);
                return -ENOMEM;
        }
 
@@ -165,11 +153,59 @@ static int __init maceps2_init(void)
        return 0;
 }
 
-static void __exit maceps2_exit(void)
+static int __devexit maceps2_remove(struct platform_device *dev)
 {
        serio_unregister_port(maceps2_port[0]);
        serio_unregister_port(maceps2_port[1]);
+
+       return 0;
+}
+
+static struct platform_driver maceps2_driver = {
+       .driver         = {
+               .name   = "maceps2",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = maceps2_probe,
+       .remove         = __devexit_p(maceps2_remove),
+};
+
+static int __init maceps2_init(void)
+{
+       int error;
+
+       error = platform_driver_register(&maceps2_driver);
+       if (error)
+               return error;
+
+       maceps2_device = platform_device_alloc("maceps2", -1);
+       if (!maceps2_device) {
+               error = -ENOMEM;
+               goto err_unregister_driver;
+       }
+
+       port_data[0].port = &mace->perif.ps2.keyb;
+       port_data[0].irq  = MACEISA_KEYB_IRQ;
+       port_data[1].port = &mace->perif.ps2.mouse;
+       port_data[1].irq  = MACEISA_MOUSE_IRQ;
+
+       error = platform_device_add(maceps2_device);
+       if (error)
+               goto err_free_device;
+
+       return 0;
+
+ err_free_device:
+       platform_device_put(maceps2_device);
+ err_unregister_driver:
+       platform_driver_unregister(&maceps2_driver);
+       return error;
+}
+
+static void __exit maceps2_exit(void)
+{
        platform_device_unregister(maceps2_device);
+       platform_driver_unregister(&maceps2_driver);
 }
 
 module_init(maceps2_init);