The exynos4_get_irq_nr function that converts a given wakeup interrupt source number to a linux irq number is simplified and replaced with the new macro exynos4_irq_eint_to_gic_irq. Signed-off-by: Thomas Abraham <thomas.abraham@xxxxxxxxxx> --- arch/arm/mach-exynos/common.c | 26 +++----------------------- 1 files changed, 3 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ac5ac0e..7dd9dd0 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -550,27 +550,7 @@ void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no) static DEFINE_SPINLOCK(eint_lock); static unsigned int eint0_15_data[16]; - -static unsigned int exynos4_get_irq_nr(unsigned int number) -{ - u32 ret = 0; - - switch (number) { - case 0 ... 3: - ret = (number + IRQ_EINT0); - break; - case 4 ... 7: - ret = (number + (IRQ_EINT4 - 4)); - break; - case 8 ... 15: - ret = (number + (IRQ_EINT8 - 8)); - break; - default: - printk(KERN_ERR "number available : %d\n", number); - } - - return ret; -} +#define exynos4_irq_eint_to_gic_irq(number) (IRQ_EINT0 + number) static inline void exynos4_irq_eint_mask(struct irq_data *data) { @@ -748,9 +728,9 @@ static int __init exynos4_init_irq_eint(void) for (irq = 0 ; irq <= 15 ; irq++) { eint0_15_data[irq] = IRQ_EINT(irq); - irq_set_handler_data(exynos4_get_irq_nr(irq), + irq_set_handler_data(exynos4_irq_eint_to_gic_irq(irq), &eint0_15_data[irq]); - irq_set_chained_handler(exynos4_get_irq_nr(irq), + irq_set_chained_handler(exynos4_irq_eint_to_gic_irq(irq), exynos4_irq_eint0_15); } -- 1.6.6.rc2 -- 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