1 files changed, 18 insertions, 50 deletions

diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index 5f63c3b83828..4f64183b27fa 100644
--- 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
 
 /*