diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s5pv310/irq-combiner.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pv310/irq-combiner.c')
| -rw-r--r-- | arch/arm/mach-s5pv310/irq-combiner.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv310/irq-combiner.c b/arch/arm/mach-s5pv310/irq-combiner.c index 0f7052164f2..c3f88c3faf6 100644 --- a/arch/arm/mach-s5pv310/irq-combiner.c +++ b/arch/arm/mach-s5pv310/irq-combiner.c @@ -66,11 +66,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) if (status == 0) goto out; - for (combiner_irq = 0; combiner_irq < 32; combiner_irq++) { - if (status & 0x1) - break; - status >>= 1; - } + combiner_irq = __ffs(status); cascade_irq = combiner_irq + (chip_data->irq_offset & ~31); if (unlikely(cascade_irq >= NR_IRQS)) |