diff --git a/[refs] b/[refs] index 44252af2872f..64b0ea448b70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d75c9128a07bd1f81952a518ed818d1a3e90c96 +refs/heads/master: 0c0f909689c8387265a3682d4205c063071ec36a diff --git a/trunk/arch/arm/mach-s5pv310/irq-combiner.c b/trunk/arch/arm/mach-s5pv310/irq-combiner.c index 0f7052164f23..c3f88c3faf6c 100644 --- a/trunk/arch/arm/mach-s5pv310/irq-combiner.c +++ b/trunk/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))