[PATCH] IRQ type flags

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

diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index cee9c734a048c9102eaeec0090c99a6e7a8656f0..83999d5831225e20ffa0bc000c326673596089f2 100644 (file)
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -12,14 +12,13 @@
  */
 
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <asm/irq.h>
 
 #include <asm/arch/spitz.h>
 #include <asm/arch/hardware.h>
@@ -309,10 +308,10 @@ static void spitzkbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int spitzkbd_suspend(struct device *dev, pm_message_t state)
+static int spitzkbd_suspend(struct platform_device *dev, pm_message_t state)
 {
        int i;
-       struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+       struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
        spitzkbd->suspended = 1;
 
        /* Set Strobe lines as inputs - *except* strobe line 0 leave this
@@ -323,10 +322,10 @@ static int spitzkbd_suspend(struct device *dev, pm_message_t state)
        return 0;
 }
 
-static int spitzkbd_resume(struct device *dev)
+static int spitzkbd_resume(struct platform_device *dev)
 {
        int i;
-       struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+       struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
        for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
                pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
@@ -342,7 +341,7 @@ static int spitzkbd_resume(struct device *dev)
 #define spitzkbd_resume                NULL
 #endif
 
-static int __init spitzkbd_probe(struct device *dev)
+static int __init spitzkbd_probe(struct platform_device *dev)
 {
        struct spitzkbd *spitzkbd;
        struct input_dev *input_dev;
@@ -358,7 +357,7 @@ static int __init spitzkbd_probe(struct device *dev)
                return -ENOMEM;
        }
 
-       dev_set_drvdata(dev, spitzkbd);
+       platform_set_drvdata(dev, spitzkbd);
        strcpy(spitzkbd->phys, "spitzkbd/input0");
 
        spin_lock_init(&spitzkbd->lock);
@@ -380,7 +379,7 @@ static int __init spitzkbd_probe(struct device *dev)
        input_dev->private = spitzkbd;
        input_dev->name = "Spitz Keyboard";
        input_dev->phys = spitzkbd->phys;
-       input_dev->cdev.dev = dev;
+       input_dev->cdev.dev = &dev->dev;
 
        input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor = 0x0001;
@@ -407,10 +406,9 @@ static int __init spitzkbd_probe(struct device *dev)
        for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) {
                pxa_gpio_mode(spitz_senses[i] | GPIO_IN);
                if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt,
-                                               SA_INTERRUPT, "Spitzkbd Sense", spitzkbd))
+                               SA_INTERRUPT|SA_TRIGGER_RISING,
+                               "Spitzkbd Sense", spitzkbd))
                        printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i);
-               else
-                       set_irq_type(IRQ_GPIO(spitz_senses[i]),IRQT_RISING);
        }
 
        /* Set Strobe lines as outputs - set high */
@@ -422,25 +420,28 @@ static int __init spitzkbd_probe(struct device *dev)
        pxa_gpio_mode(SPITZ_GPIO_SWA | GPIO_IN);
        pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN);
 
-       request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt, SA_INTERRUPT, "Spitzkbd Sync", spitzkbd);
-       request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt, SA_INTERRUPT, "Spitzkbd PwrOn", spitzkbd);
-       request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr, SA_INTERRUPT, "Spitzkbd SWA", spitzkbd);
-       request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, SA_INTERRUPT, "Spitzkbd SWB", spitzkbd);
-
-       set_irq_type(SPITZ_IRQ_GPIO_SYNC, IRQT_BOTHEDGE);
-       set_irq_type(SPITZ_IRQ_GPIO_ON_KEY, IRQT_BOTHEDGE);
-       set_irq_type(SPITZ_IRQ_GPIO_SWA, IRQT_BOTHEDGE);
-       set_irq_type(SPITZ_IRQ_GPIO_SWB, IRQT_BOTHEDGE);
+       request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,
+                   SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                   "Spitzkbd Sync", spitzkbd);
+       request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,
+                   SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                   "Spitzkbd PwrOn", spitzkbd);
+       request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,
+                   SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                   "Spitzkbd SWA", spitzkbd);
+       request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
+                   SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
+                   "Spitzkbd SWB", spitzkbd);
 
        printk(KERN_INFO "input: Spitz Keyboard Registered\n");
 
        return 0;
 }
 
-static int spitzkbd_remove(struct device *dev)
+static int spitzkbd_remove(struct platform_device *dev)
 {
        int i;
-       struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+       struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
        for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++)
                free_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd);
@@ -460,23 +461,24 @@ static int spitzkbd_remove(struct device *dev)
        return 0;
 }
 
-static struct device_driver spitzkbd_driver = {
-       .name           = "spitz-keyboard",
-       .bus            = &platform_bus_type,
+static struct platform_driver spitzkbd_driver = {
        .probe          = spitzkbd_probe,
        .remove         = spitzkbd_remove,
        .suspend        = spitzkbd_suspend,
        .resume         = spitzkbd_resume,
+       .driver         = {
+               .name   = "spitz-keyboard",
+       },
 };
 
 static int __devinit spitzkbd_init(void)
 {
-       return driver_register(&spitzkbd_driver);
+       return platform_driver_register(&spitzkbd_driver);
 }
 
 static void __exit spitzkbd_exit(void)
 {
-       driver_unregister(&spitzkbd_driver);
+       platform_driver_unregister(&spitzkbd_driver);
 }
 
 module_init(spitzkbd_init);