From: Heiko Stuebner Date: Tue, 29 Jan 2013 18:25:22 +0000 (-0800) Subject: ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property X-Git-Tag: v3.9-rc1~122^2~7^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4a343e5b333ca02f7731c824b600fe64d8ce28c;p=profile%2Fivi%2Fkernel-x86-ivi.git ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property This gets rid of the use of static irq mappings there. Signed-off-by: Heiko Stuebner Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/mach-s3c24xx/irq-pm.c b/arch/arm/mach-s3c24xx/irq-pm.c index d48126d..640ec91 100644 --- a/arch/arm/mach-s3c24xx/irq-pm.c +++ b/arch/arm/mach-s3c24xx/irq-pm.c @@ -30,18 +30,18 @@ * set bit to 1 in allow bitfield to enable the wakeup settings on it */ -unsigned long s3c_irqwake_intallow = 1L << (IRQ_RTC - IRQ_EINT0) | 0xfL; +unsigned long s3c_irqwake_intallow = 1L << 30 | 0xfL; unsigned long s3c_irqwake_eintallow = 0x0000fff0L; int s3c_irq_wake(struct irq_data *data, unsigned int state) { - unsigned long irqbit = 1 << (data->irq - IRQ_EINT0); + unsigned long irqbit = 1 << data->hwirq; if (!(s3c_irqwake_intallow & irqbit)) return -ENOENT; - printk(KERN_INFO "wake %s for irq %d\n", - state ? "enabled" : "disabled", data->irq); + pr_info("wake %s for hwirq %lu\n", + state ? "enabled" : "disabled", data->hwirq); if (!state) s3c_irqwake_intmask |= irqbit;