Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5aeffb7 authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Convert s3c_irqext_wake() to new irq_ interrupt methods 



Kernel 2.6.37 adds new interrupt methods which take a struct irq_data
rather than an irq number. Begin converting Samsung platforms over to
these methods by converting s3c_irqext_wake() with a simple textual
substitution.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 387c31c7

arch/arm/mach-s3c64xx/irq-eint.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static struct irq_chip s3c_irq_eint = { 
	.mask_ack	= s3c_irq_eint_maskack,

	.ack		= s3c_irq_eint_ack,

	.set_type	= s3c_irq_eint_set_type,

	.set_wake	= s3c_irqext_wake,

	.irq_set_wake	= s3c_irqext_wake,

};



/* s3c_irq_demux_eint

arch/arm/mach-s5pv310/irq-eint.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct irq_chip s5pv310_irq_eint = { 
	.ack		= s5pv310_irq_eint_ack,

	.set_type	= s5pv310_irq_eint_set_type,

#ifdef CONFIG_PM

	.set_wake	= s3c_irqext_wake,

	.irq_set_wake	= s3c_irqext_wake,

#endif

};

arch/arm/plat-s3c24xx/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct irq_chip s3c_irqext_chip = { 
	.unmask		= s3c_irqext_unmask,

	.ack		= s3c_irqext_ack,

	.set_type	= s3c_irqext_type,

	.set_wake	= s3c_irqext_wake

	.irq_set_wake	= s3c_irqext_wake

};



static struct irq_chip s3c_irq_eint0t4 = {

arch/arm/plat-s5p/irq-eint.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct irq_chip s5p_irq_eint = { 
	.ack		= s5p_irq_eint_ack,

	.set_type	= s5p_irq_eint_set_type,

#ifdef CONFIG_PM

	.set_wake	= s3c_irqext_wake,

	.irq_set_wake	= s3c_irqext_wake,

#endif

};
@@ -194,7 +194,7 @@ static struct irq_chip s5p_irq_vic_eint = { 
	.ack		= s5p_irq_vic_eint_ack,

	.set_type	= s5p_irq_eint_set_type,

#ifdef CONFIG_PM

	.set_wake	= s3c_irqext_wake,

	.irq_set_wake	= s3c_irqext_wake,

#endif

};

arch/arm/plat-samsung/include/plat/pm.h

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 * management

*/



#include <linux/irq.h>



#ifdef CONFIG_PM



extern __init int s3c_pm_init(void);
@@ -100,7 +102,7 @@ extern void s3c_pm_do_restore(struct sleep_save *ptr, int count); 
extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count);



#ifdef CONFIG_PM

extern int s3c_irqext_wake(unsigned int irqno, unsigned int state);

extern int s3c_irqext_wake(struct irq_data *data, unsigned int state);

extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state);

extern int s3c24xx_irq_resume(struct sys_device *dev);

#else