diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-17 17:23:40 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-17 17:23:40 -0400 |
| commit | 2d2a9163bd4f3ba301f8138c32e4790edc30156c (patch) | |
| tree | ac7d43e6c4f6a2f357454c42d762595cc358104d /arch/arm/mach-s3c2410/irq.c | |
| parent | 1c1be3a949a61427a962771c85a347c822aeb991 (diff) | |
| parent | 2e711c04dbbf7a7732a3f7073b1fc285d12b369d (diff) | |
Merge branch 'syscore' into for-linus
* syscore:
PM: Remove sysdev suspend, resume and shutdown operations
PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM
PM / AVR32: Use struct syscore_ops instead of sysdevs for PM
PM / Blackfin: Use struct syscore_ops instead of sysdevs for PM
ARM / Samsung: Use struct syscore_ops for "core" power management
ARM / PXA: Use struct syscore_ops for "core" power management
ARM / SA1100: Use struct syscore_ops for "core" power management
ARM / Integrator: Use struct syscore_ops for core PM
ARM / OMAP: Use struct syscore_ops for "core" power management
ARM: Use struct syscore_ops instead of sysdevs for PM in common code
Diffstat (limited to 'arch/arm/mach-s3c2410/irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/irq.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c index 5e2f35332056..2854129f8cc7 100644 --- a/arch/arm/mach-s3c2410/irq.c +++ b/arch/arm/mach-s3c2410/irq.c | |||
| @@ -23,38 +23,12 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/sysdev.h> | 26 | #include <linux/syscore_ops.h> |
| 27 | 27 | ||
| 28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
| 29 | #include <plat/pm.h> | 29 | #include <plat/pm.h> |
| 30 | 30 | ||
| 31 | static int s3c2410_irq_add(struct sys_device *sysdev) | 31 | struct syscore_ops s3c24xx_irq_syscore_ops = { |
| 32 | { | ||
| 33 | return 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | static struct sysdev_driver s3c2410_irq_driver = { | ||
| 37 | .add = s3c2410_irq_add, | ||
| 38 | .suspend = s3c24xx_irq_suspend, | 32 | .suspend = s3c24xx_irq_suspend, |
| 39 | .resume = s3c24xx_irq_resume, | 33 | .resume = s3c24xx_irq_resume, |
| 40 | }; | 34 | }; |
| 41 | |||
| 42 | static int __init s3c2410_irq_init(void) | ||
| 43 | { | ||
| 44 | return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_irq_driver); | ||
| 45 | } | ||
| 46 | |||
| 47 | arch_initcall(s3c2410_irq_init); | ||
| 48 | |||
| 49 | static struct sysdev_driver s3c2410a_irq_driver = { | ||
| 50 | .add = s3c2410_irq_add, | ||
| 51 | .suspend = s3c24xx_irq_suspend, | ||
| 52 | .resume = s3c24xx_irq_resume, | ||
| 53 | }; | ||
| 54 | |||
| 55 | static int __init s3c2410a_irq_init(void) | ||
| 56 | { | ||
| 57 | return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_irq_driver); | ||
| 58 | } | ||
| 59 | |||
| 60 | arch_initcall(s3c2410a_irq_init); | ||