[PATCH] Fix compile failures by syscore_ops change on s3c2416

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



s3c24xx_irq_syscore_ops is only defined in mach-s3c2410/irq.c which is
not used by s3c2416.
Also s3c2410_dma_chan needs a struct prefix
---
It feels wrong to put a double of s3c24xx_irq_syscore_ops in another
file, but I haven't found a better place for the whole thing yet.
Might plat-s3c24xx/irq-pm.c be better suited to host
s3c24xx_irq_syscore_ops for all s3c-socs?

 arch/arm/mach-s3c2416/irq.c |    6 ++++++
 arch/arm/plat-s3c24xx/dma.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 28ad20d..a2c49fa 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -27,6 +27,7 @@
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
 #include <linux/io.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -238,6 +239,11 @@ static struct sysdev_driver s3c2416_irq_driver = {
 	.add		= s3c2416_irq_add,
 };
 
+struct syscore_ops s3c24xx_irq_syscore_ops = {
+	.suspend	= s3c24xx_irq_suspend,
+	.resume		= s3c24xx_irq_resume,
+};
+
 static int __init s3c2416_irq_init(void)
 {
 	return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_irq_driver);
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index c10d10c..2abf966 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1199,7 +1199,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition);
 
 #ifdef CONFIG_PM
 
-static void s3c2410_dma_suspend_chan(s3c2410_dma_chan *cp)
+static void s3c2410_dma_suspend_chan(struct s3c2410_dma_chan *cp)
 {
 	printk(KERN_DEBUG "suspending dma channel %d\n", cp->number);
 
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux SoC Development]     [Linux Rockchip Development]     [Linux USB Development]     [Video for Linux]     [Linux Audio Users]     [Linux SCSI]     [Yosemite News]

  Powered by Linux