aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/autoprobe.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-27 08:45:02 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-04 06:43:43 -0400
commitbc310dda41be6439364c8f3b9fe7c9d743d22b1c (patch)
tree86a8b4da3d9e81aad104b61023858813454b0f35 /kernel/irq/autoprobe.c
parentc5f756344c390f629243b4a28c2bd198fdfd7ee9 (diff)
genirq: Provide compat handling for chip->disable()/shutdown()
Wrap the old chip functions disable() and shutdown() until the migration is complete and the old chip functions are removed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20100927121842.532070631@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r--kernel/irq/autoprobe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index f9bf9b228033..95806a45be78 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -98,7 +98,7 @@ unsigned long probe_irq_on(void)
98 /* It triggered already - consider it spurious. */ 98 /* It triggered already - consider it spurious. */
99 if (!(status & IRQ_WAITING)) { 99 if (!(status & IRQ_WAITING)) {
100 desc->status = status & ~IRQ_AUTODETECT; 100 desc->status = status & ~IRQ_AUTODETECT;
101 desc->irq_data.chip->shutdown(i); 101 desc->irq_data.chip->irq_shutdown(&desc->irq_data);
102 } else 102 } else
103 if (i < 32) 103 if (i < 32)
104 mask |= 1 << i; 104 mask |= 1 << i;
@@ -137,7 +137,7 @@ unsigned int probe_irq_mask(unsigned long val)
137 mask |= 1 << i; 137 mask |= 1 << i;
138 138
139 desc->status = status & ~IRQ_AUTODETECT; 139 desc->status = status & ~IRQ_AUTODETECT;
140 desc->irq_data.chip->shutdown(i); 140 desc->irq_data.chip->irq_shutdown(&desc->irq_data);
141 } 141 }
142 raw_spin_unlock_irq(&desc->lock); 142 raw_spin_unlock_irq(&desc->lock);
143 } 143 }
@@ -181,7 +181,7 @@ int probe_irq_off(unsigned long val)
181 nr_of_irqs++; 181 nr_of_irqs++;
182 } 182 }
183 desc->status = status & ~IRQ_AUTODETECT; 183 desc->status = status & ~IRQ_AUTODETECT;
184 desc->irq_data.chip->shutdown(i); 184 desc->irq_data.chip->irq_shutdown(&desc->irq_data);
185 } 185 }
186 raw_spin_unlock_irq(&desc->lock); 186 raw_spin_unlock_irq(&desc->lock);
187 } 187 }