1 files changed, 7 insertions, 20 deletions

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 6bde5956358d..fed363cec9c6 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/irq.h>
 
 #include <asm/mach/map.h>
@@ -285,7 +285,7 @@ static inline void pxa25x_init_pm(void) {}
 
 static int pxa25x_set_wake(struct irq_data *d, unsigned int on)
 {
-        int gpio = IRQ_TO_GPIO(d->irq);
+        int gpio = irq_to_gpio(d->irq);
         uint32_t mask = 0;
 
         if (gpio >= 0 && gpio < 85)
@@ -350,21 +350,9 @@ static struct platform_device *pxa25x_devices[] __initdata = {
         &pxa_device_asoc_platform,
 };
 
-static struct sys_device pxa25x_sysdev[] = {
-        {
-                .cls    = &pxa_irq_sysclass,
-        }, {
-                .cls    = &pxa2xx_mfp_sysclass,
-        }, {
-                .cls    = &pxa_gpio_sysclass,
-        }, {
-                .cls    = &pxa2xx_clock_sysclass,
-        }
-};
-
 static int __init pxa25x_init(void)
 {
-        int i, ret = 0;
+        int ret = 0;
 
         if (cpu_is_pxa25x()) {
 
@@ -377,11 +365,10 @@ static int __init pxa25x_init(void)
 
                 pxa25x_init_pm();
 
-                for (i = 0; i < ARRAY_SIZE(pxa25x_sysdev); i++) {
-                        ret = sysdev_register(&pxa25x_sysdev[i]);
-                        if (ret)
-                                pr_err("failed to register sysdev[%d]\n", i);
-                }
+                register_syscore_ops(&pxa_irq_syscore_ops);
+                register_syscore_ops(&pxa2xx_mfp_syscore_ops);
+                register_syscore_ops(&pxa_gpio_syscore_ops);
+                register_syscore_ops(&pxa2xx_clock_syscore_ops);
 
                 ret = platform_add_devices(pxa25x_devices,
                                            ARRAY_SIZE(pxa25x_devices));