aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/autoprobe.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r--kernel/irq/autoprobe.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 3467097ca61a..6f1e68a46cbc 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -41,7 +41,7 @@ unsigned long probe_irq_on(void)
41 41
42 spin_lock_irq(&desc->lock); 42 spin_lock_irq(&desc->lock);
43 if (!irq_desc[i].action) 43 if (!irq_desc[i].action)
44 irq_desc[i].handler->startup(i); 44 irq_desc[i].chip->startup(i);
45 spin_unlock_irq(&desc->lock); 45 spin_unlock_irq(&desc->lock);
46 } 46 }
47 47
@@ -59,7 +59,7 @@ unsigned long probe_irq_on(void)
59 spin_lock_irq(&desc->lock); 59 spin_lock_irq(&desc->lock);
60 if (!desc->action) { 60 if (!desc->action) {
61 desc->status |= IRQ_AUTODETECT | IRQ_WAITING; 61 desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
62 if (desc->handler->startup(i)) 62 if (desc->chip->startup(i))
63 desc->status |= IRQ_PENDING; 63 desc->status |= IRQ_PENDING;
64 } 64 }
65 spin_unlock_irq(&desc->lock); 65 spin_unlock_irq(&desc->lock);
@@ -85,7 +85,7 @@ unsigned long probe_irq_on(void)
85 /* It triggered already - consider it spurious. */ 85 /* It triggered already - consider it spurious. */
86 if (!(status & IRQ_WAITING)) { 86 if (!(status & IRQ_WAITING)) {
87 desc->status = status & ~IRQ_AUTODETECT; 87 desc->status = status & ~IRQ_AUTODETECT;
88 desc->handler->shutdown(i); 88 desc->chip->shutdown(i);
89 } else 89 } else
90 if (i < 32) 90 if (i < 32)
91 val |= 1 << i; 91 val |= 1 << i;
@@ -128,7 +128,7 @@ unsigned int probe_irq_mask(unsigned long val)
128 mask |= 1 << i; 128 mask |= 1 << i;
129 129
130 desc->status = status & ~IRQ_AUTODETECT; 130 desc->status = status & ~IRQ_AUTODETECT;
131 desc->handler->shutdown(i); 131 desc->chip->shutdown(i);
132 } 132 }
133 spin_unlock_irq(&desc->lock); 133 spin_unlock_irq(&desc->lock);
134 } 134 }
@@ -173,7 +173,7 @@ int probe_irq_off(unsigned long val)
173 nr_irqs++; 173 nr_irqs++;
174 } 174 }
175 desc->status = status & ~IRQ_AUTODETECT; 175 desc->status = status & ~IRQ_AUTODETECT;
176 desc->handler->shutdown(i); 176 desc->chip->shutdown(i);
177 } 177 }
178 spin_unlock_irq(&desc->lock); 178 spin_unlock_irq(&desc->lock);
179 } 179 }