Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[cascardo/linux.git] / drivers / sh / intc / core.c

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 9739431..c6ca115 100644 (file)
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/sh_intc.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/radix-tree.h>
@@ -62,7 +63,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)
 
 static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
 {
-       generic_handle_irq((unsigned int)get_irq_data(irq));
+       generic_handle_irq((unsigned int)irq_get_handler_data(irq));
 }
 
 static void __init intc_register_irq(struct intc_desc *desc,
@@ -115,9 +116,9 @@ static void __init intc_register_irq(struct intc_desc *desc,
        irq_data = irq_get_irq_data(irq);
 
        disable_irq_nosync(irq);
-       set_irq_chip_and_handler_name(irq, &d->chip,
-                                     handle_level_irq, "level");
-       set_irq_chip_data(irq, (void *)data[primary]);
+       irq_set_chip_and_handler_name(irq, &d->chip, handle_level_irq,
+                                     "level");
+       irq_set_chip_data(irq, (void *)data[primary]);
 
        /*
         * set priority level
@@ -339,9 +340,9 @@ int __init register_intc_controller(struct intc_desc *desc)
                        vect2->enum_id = 0;
 
                        /* redirect this interrupts to the first one */
-                       set_irq_chip(irq2, &dummy_irq_chip);
-                       set_irq_chained_handler(irq2, intc_redirect_irq);
-                       set_irq_data(irq2, (void *)irq);
+                       irq_set_chip(irq2, &dummy_irq_chip);
+                       irq_set_chained_handler(irq2, intc_redirect_irq);
+                       irq_set_handler_data(irq2, (void *)irq);
                }
        }
 
@@ -376,91 +377,84 @@ err0:
        return -ENOMEM;
 }
 
-static ssize_t
-show_intc_name(struct sys_device *dev, struct sysdev_attribute *attr, char *buf)
+static int intc_suspend(void)
 {
        struct intc_desc_int *d;
 
-       d = container_of(dev, struct intc_desc_int, sysdev);
+       list_for_each_entry(d, &intc_list, list) {
+               int irq;
 
-       return sprintf(buf, "%s\n", d->chip.name);
-}
+               /* enable wakeup irqs belonging to this intc controller */
+               for_each_active_irq(irq) {
+                       struct irq_data *data;
+                       struct irq_chip *chip;
 
-static SYSDEV_ATTR(name, S_IRUGO, show_intc_name, NULL);
+                       data = irq_get_irq_data(irq);
+                       chip = irq_data_get_irq_chip(data);
+                       if (chip != &d->chip)
+                               continue;
+                       if (irqd_is_wakeup_set(data))
+                               chip->irq_enable(data);
+               }
+       }
+       return 0;
+}
 
-static int intc_suspend(struct sys_device *dev, pm_message_t state)
+static void intc_resume(void)
 {
        struct intc_desc_int *d;
-       struct irq_data *data;
-       struct irq_desc *desc;
-       struct irq_chip *chip;
-       int irq;
 
-       /* get intc controller associated with this sysdev */
-       d = container_of(dev, struct intc_desc_int, sysdev);
-
-       switch (state.event) {
-       case PM_EVENT_ON:
-               if (d->state.event != PM_EVENT_FREEZE)
-                       break;
+       list_for_each_entry(d, &intc_list, list) {
+               int irq;
 
                for_each_active_irq(irq) {
-                       desc = irq_to_desc(irq);
+                       struct irq_data *data;
+                       struct irq_chip *chip;
+
                        data = irq_get_irq_data(irq);
                        chip = irq_data_get_irq_chip(data);
-
                        /*
                         * This will catch the redirect and VIRQ cases
                         * due to the dummy_irq_chip being inserted.
                         */
                        if (chip != &d->chip)
                                continue;
-                       if (desc->status & IRQ_DISABLED)
+                       if (irqd_irq_disabled(data))
                                chip->irq_disable(data);
                        else
                                chip->irq_enable(data);
                }
-               break;
-       case PM_EVENT_FREEZE:
-               /* nothing has to be done */
-               break;
-       case PM_EVENT_SUSPEND:
-               /* enable wakeup irqs belonging to this intc controller */
-               for_each_active_irq(irq) {
-                       desc = irq_to_desc(irq);
-                       data = irq_get_irq_data(irq);
-                       chip = irq_data_get_irq_chip(data);
-
-                       if (chip != &d->chip)
-                               continue;
-                       if ((desc->status & IRQ_WAKEUP))
-                               chip->irq_enable(data);
-               }
-               break;
        }
-
-       d->state = state;
-
-       return 0;
 }
 
-static int intc_resume(struct sys_device *dev)
-{
-       return intc_suspend(dev, PMSG_ON);
-}
+struct syscore_ops intc_syscore_ops = {
+       .suspend        = intc_suspend,
+       .resume         = intc_resume,
+};
 
 struct sysdev_class intc_sysdev_class = {
        .name           = "intc",
-       .suspend        = intc_suspend,
-       .resume         = intc_resume,
 };
 
-/* register this intc as sysdev to allow suspend/resume */
+static ssize_t
+show_intc_name(struct sys_device *dev, struct sysdev_attribute *attr, char *buf)
+{
+       struct intc_desc_int *d;
+
+       d = container_of(dev, struct intc_desc_int, sysdev);
+
+       return sprintf(buf, "%s\n", d->chip.name);
+}
+
+static SYSDEV_ATTR(name, S_IRUGO, show_intc_name, NULL);
+
 static int __init register_intc_sysdevs(void)
 {
        struct intc_desc_int *d;
        int error;
 
+       register_syscore_ops(&intc_syscore_ops);
+
        error = sysdev_class_register(&intc_sysdev_class);
        if (!error) {
                list_for_each_entry(d, &intc_list, list) {