generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_desc[]

[linux-2.6-omap-h63xx.git] / kernel / irq / autoprobe.c

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 533068cfb607fad10202210b916909efd314cbb7..c45ab718cf078d493a0cc992dc54c1234ca3eaf5 100644 (file)
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -38,8 +38,8 @@ unsigned long probe_irq_on(void)
         * something may have generated an irq long ago and we want to
         * flush such a longstanding irq before considering it as spurious.
         */
-       for (i = NR_IRQS-1; i > 0; i--) {
-               desc = irq_desc + i;
+       for (i = nr_irqs-1; i > 0; i--) {
+               desc = irq_to_desc(i);
 
                spin_lock_irq(&desc->lock);
                if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
@@ -68,8 +68,8 @@ unsigned long probe_irq_on(void)
         * (we must startup again here because if a longstanding irq
         * happened in the previous stage, it may have masked itself)
         */
-       for (i = NR_IRQS-1; i > 0; i--) {
-               desc = irq_desc + i;
+       for (i = nr_irqs-1; i > 0; i--) {
+               desc = irq_to_desc(i);
 
                spin_lock_irq(&desc->lock);
                if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
@@ -89,10 +89,10 @@ unsigned long probe_irq_on(void)
         * Now filter out any obviously spurious interrupts
         */
        mask = 0;
-       for (i = 0; i < NR_IRQS; i++) {
+       for (i = 0; i < nr_irqs; i++) {
                unsigned int status;
 
-               desc = irq_desc + i;
+               desc = irq_to_desc(i);
                spin_lock_irq(&desc->lock);
                status = desc->status;
 
@@ -130,8 +130,8 @@ unsigned int probe_irq_mask(unsigned long val)
        int i;
 
        mask = 0;
-       for (i = 0; i < NR_IRQS; i++) {
-               struct irq_desc *desc = irq_desc + i;
+       for (i = 0; i < nr_irqs; i++) {
+               struct irq_desc *desc = irq_to_desc(i);
                unsigned int status;
 
                spin_lock_irq(&desc->lock);
@@ -173,8 +173,8 @@ int probe_irq_off(unsigned long val)
 {
        int i, irq_found = 0, nr_irqs = 0;
 
-       for (i = 0; i < NR_IRQS; i++) {
-               struct irq_desc *desc = irq_desc + i;
+       for (i = 0; i < nr_irqs; i++) {
+               struct irq_desc *desc = irq_to_desc(i);
                unsigned int status;
 
                spin_lock_irq(&desc->lock);