sh: Use struct syscore_ops instead of sysdevs

Convert the SuperH clocks framework and shared interrupt handling
code to using struct syscore_ops instead of a sysdev classes and
sysdevs for power managment.

This reduces the code size significantly and simplifies it.  The
optimizations causing things not to be restored after creating a
hibernation image are removed, but they might lead to undesirable
effects during resume from hibernation (e.g. the clocks would be left
as the boot kernel set them, which might be not the same way as the
hibernated kernel had seen them before the hibernation).

This also is necessary for removing sysdevs from the kernel entirely
in the future.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index 5f63c3b83828ea1db4c9e18cb2eb7a92b9611dc6..4f64183b27fa6283c80d4fa2d37aa61c61c127fe 100644 (file)
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
@@ -21,7 +21,7 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/seq_file.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -630,68 +630,36 @@ long clk_round_parent(struct clk *clk, unsigned long target,
 EXPORT_SYMBOL_GPL(clk_round_parent);
 
 #ifdef CONFIG_PM
-static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
+static void clks_core_resume(void)
 {
-       static pm_message_t prev_state;
        struct clk *clkp;
 
-       switch (state.event) {
-       case PM_EVENT_ON:
-               /* Resumeing from hibernation */
-               if (prev_state.event != PM_EVENT_FREEZE)
-                       break;
-
-               list_for_each_entry(clkp, &clock_list, node) {
-                       if (likely(clkp->ops)) {
-                               unsigned long rate = clkp->rate;
-
-                               if (likely(clkp->ops->set_parent))
-                                       clkp->ops->set_parent(clkp,
-                                               clkp->parent);
-                               if (likely(clkp->ops->set_rate))
-                                       clkp->ops->set_rate(clkp, rate);
-                               else if (likely(clkp->ops->recalc))
-                                       clkp->rate = clkp->ops->recalc(clkp);
-                       }
+       list_for_each_entry(clkp, &clock_list, node) {
+               if (likely(clkp->ops)) {
+                       unsigned long rate = clkp->rate;
+
+                       if (likely(clkp->ops->set_parent))
+                               clkp->ops->set_parent(clkp,
+                                       clkp->parent);
+                       if (likely(clkp->ops->set_rate))
+                               clkp->ops->set_rate(clkp, rate);
+                       else if (likely(clkp->ops->recalc))
+                               clkp->rate = clkp->ops->recalc(clkp);
                }
-               break;
-       case PM_EVENT_FREEZE:
-               break;
-       case PM_EVENT_SUSPEND:
-               break;
        }
-
-       prev_state = state;
-       return 0;
-}
-
-static int clks_sysdev_resume(struct sys_device *dev)
-{
-       return clks_sysdev_suspend(dev, PMSG_ON);
 }
 
-static struct sysdev_class clks_sysdev_class = {
-       .name = "clks",
-};
-
-static struct sysdev_driver clks_sysdev_driver = {
-       .suspend = clks_sysdev_suspend,
-       .resume = clks_sysdev_resume,
-};
-
-static struct sys_device clks_sysdev_dev = {
-       .cls = &clks_sysdev_class,
+static struct syscore_ops clks_syscore_ops = {
+       .resume = clks_core_resume,
 };
 
-static int __init clk_sysdev_init(void)
+static int __init clk_syscore_init(void)
 {
-       sysdev_class_register(&clks_sysdev_class);
-       sysdev_driver_register(&clks_sysdev_class, &clks_sysdev_driver);
-       sysdev_register(&clks_sysdev_dev);
+       register_syscore_ops(&clks_syscore_ops);
 
        return 0;
 }
-subsys_initcall(clk_sysdev_init);
+subsys_initcall(clk_syscore_init);
 #endif
 
 /*

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 9739431092d126aefdef78ec03888c66b40b256d..5833afbf08d705899258463f3b772134557dc7a0 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>
@@ -376,91 +377,89 @@ 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_desc *desc;
+                       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;
+                       desc = irq_to_desc(irq);
+                       if ((desc->status & IRQ_WAKEUP))
+                               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_desc *desc;
+                       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;
+                       desc = irq_to_desc(irq);
                        if (desc->status & IRQ_DISABLED)
                                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) {

diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h
index 0cf8260971d4b72ccff501708da25d7b01841e88..df36a421e6756b5e775e16d2b8995b769f18e875 100644 (file)
--- a/drivers/sh/intc/internals.h
+++ b/drivers/sh/intc/internals.h
@@ -53,7 +53,6 @@ struct intc_desc_int {
        struct list_head list;
        struct sys_device sysdev;
        struct radix_tree_root tree;
-       pm_message_t state;
        raw_spinlock_t lock;
        unsigned int index;
        unsigned long *reg;