From 54256a5b462a0b1bd22e7669570f97f28546b93e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 24 Mar 2011 12:33:40 +0100 Subject: [PATCH] --- yaml --- r: 243289 b: refs/heads/master c: cf0d6b76c11b565f8d8b7d527d17b9f82eb3b3a5 h: refs/heads/master i: 243287: 71bc8de607b3aa9377c902f28bc3da30bc5a141f v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/hw_irq.h | 8 -------- trunk/arch/arm/mach-dove/irq.c | 5 ++--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 378bd09e11ad..08d510656e34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdea77b88ea19525cce3b850f9183286b8a554e0 +refs/heads/master: cf0d6b76c11b565f8d8b7d527d17b9f82eb3b3a5 diff --git a/trunk/arch/arm/include/asm/hw_irq.h b/trunk/arch/arm/include/asm/hw_irq.h index 5586b7c8ef6f..a71b417b1856 100644 --- a/trunk/arch/arm/include/asm/hw_irq.h +++ b/trunk/arch/arm/include/asm/hw_irq.h @@ -10,14 +10,6 @@ static inline void ack_bad_irq(int irq) irq_err_count++; } -/* - * Obsolete inline function for calling irq descriptor handlers. - */ -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) -{ - desc->handle_irq(irq, desc); -} - void set_irq_flags(unsigned int irq, unsigned int flags); #define IRQF_VALID (1 << 0) diff --git a/trunk/arch/arm/mach-dove/irq.c b/trunk/arch/arm/mach-dove/irq.c index 101707fa2e2c..aac6e23763e0 100644 --- a/trunk/arch/arm/mach-dove/irq.c +++ b/trunk/arch/arm/mach-dove/irq.c @@ -86,8 +86,7 @@ static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc) if (!(cause & (1 << irq))) continue; irq = pmu_to_irq(irq); - desc = irq_desc + irq; - desc_handle_irq(irq, desc); + generic_handle_irq(irq); } } @@ -124,7 +123,7 @@ void __init dove_init_irq(void) for (i = IRQ_DOVE_PMU_START; i < NR_IRQS; i++) { set_irq_chip(i, &pmu_irq_chip); set_irq_handler(i, handle_level_irq); - irq_desc[i].status |= IRQ_LEVEL; + irq_set_status_flags(i, IRQ_LEVEL); set_irq_flags(i, IRQF_VALID); } set_irq_chained_handler(IRQ_DOVE_PMU, pmu_irq_handler);