AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Mark Brown 2010-12-02 14:35:38 +09:00 committed by Kukjin Kim
parent 387c31c7e5
commit f5aeffb784
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c64xx/irq-eint.c
View File

@ -145,7 +145,7 @@ static struct irq_chip s3c_irq_eint = {
.mask_ack = s3c_irq_eint_maskack, .mask_ack = s3c_irq_eint_maskack,
.ack = s3c_irq_eint_ack, .ack = s3c_irq_eint_ack,
.set_type = s3c_irq_eint_set_type, .set_type = s3c_irq_eint_set_type,
.set_wake = s3c_irqext_wake, .irq_set_wake = s3c_irqext_wake,
}; };
/* s3c_irq_demux_eint /* s3c_irq_demux_eint

2
arch/arm/mach-s5pv310/irq-eint.c
View File

@ -152,7 +152,7 @@ static struct irq_chip s5pv310_irq_eint = {
.ack = s5pv310_irq_eint_ack, .ack = s5pv310_irq_eint_ack,
.set_type = s5pv310_irq_eint_set_type, .set_type = s5pv310_irq_eint_set_type,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.set_wake = s3c_irqext_wake, .irq_set_wake = s3c_irqext_wake,
#endif #endif
}; };

2
arch/arm/plat-s3c24xx/irq.c
View File

@ -238,7 +238,7 @@ static struct irq_chip s3c_irqext_chip = {
.unmask = s3c_irqext_unmask, .unmask = s3c_irqext_unmask,
.ack = s3c_irqext_ack, .ack = s3c_irqext_ack,
.set_type = s3c_irqext_type, .set_type = s3c_irqext_type,
.set_wake = s3c_irqext_wake .irq_set_wake = s3c_irqext_wake
}; };
static struct irq_chip s3c_irq_eint0t4 = { static struct irq_chip s3c_irq_eint0t4 = {

4
arch/arm/plat-s5p/irq-eint.c
View File

@ -125,7 +125,7 @@ static struct irq_chip s5p_irq_eint = {
.ack = s5p_irq_eint_ack, .ack = s5p_irq_eint_ack,
.set_type = s5p_irq_eint_set_type, .set_type = s5p_irq_eint_set_type,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.set_wake = s3c_irqext_wake, .irq_set_wake = s3c_irqext_wake,
#endif #endif
}; };
@ -194,7 +194,7 @@ static struct irq_chip s5p_irq_vic_eint = {
.ack = s5p_irq_vic_eint_ack, .ack = s5p_irq_vic_eint_ack,
.set_type = s5p_irq_eint_set_type, .set_type = s5p_irq_eint_set_type,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.set_wake = s3c_irqext_wake, .irq_set_wake = s3c_irqext_wake,
#endif #endif
}; };

4
arch/arm/plat-samsung/include/plat/pm.h
View File

@ -15,6 +15,8 @@
* management * management
*/ */
#include <linux/irq.h>
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern __init int s3c_pm_init(void); 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); extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count);
#ifdef CONFIG_PM #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_suspend(struct sys_device *dev, pm_message_t state);
extern int s3c24xx_irq_resume(struct sys_device *dev); extern int s3c24xx_irq_resume(struct sys_device *dev);
#else #else

6
arch/arm/plat-samsung/pm.c
View File

@ -136,15 +136,15 @@ static void s3c_pm_restore_uarts(void) { }
unsigned long s3c_irqwake_intmask = 0xffffffffL; unsigned long s3c_irqwake_intmask = 0xffffffffL;
unsigned long s3c_irqwake_eintmask = 0xffffffffL; unsigned long s3c_irqwake_eintmask = 0xffffffffL;
int s3c_irqext_wake(unsigned int irqno, unsigned int state) int s3c_irqext_wake(struct irq_data *data, unsigned int state)
{ {
unsigned long bit = 1L << IRQ_EINT_BIT(irqno); unsigned long bit = 1L << IRQ_EINT_BIT(data->irq);
if (!(s3c_irqwake_eintallow & bit)) if (!(s3c_irqwake_eintallow & bit))
return -ENOENT; return -ENOENT;
printk(KERN_INFO "wake %s for irq %d\n", printk(KERN_INFO "wake %s for irq %d\n",
state ? "enabled" : "disabled", irqno); state ? "enabled" : "disabled", data->irq);
if (!state) if (!state)
s3c_irqwake_eintmask |= bit; s3c_irqwake_eintmask |= bit;