diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-03 06:27:44 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:10 -0500 |
commit | 87923470c712dff00b101ffb6b6fbc27bd7a6df5 (patch) | |
tree | 35dc1a0adec4d00bbc872ce096c481cf0d69314a /kernel/irq/chip.c | |
parent | 4699923861513671d3f6ade8efb4e56a9a7ecadf (diff) |
genirq: Consolidate disable/enable
Create irq_disable/enable and use them to keep the flags consistent.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 988fe7a24282..86c8e42f7fe4 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -200,7 +200,7 @@ int irq_startup(struct irq_desc *desc) | |||
200 | if (desc->irq_data.chip->irq_startup) | 200 | if (desc->irq_data.chip->irq_startup) |
201 | return desc->irq_data.chip->irq_startup(&desc->irq_data); | 201 | return desc->irq_data.chip->irq_startup(&desc->irq_data); |
202 | 202 | ||
203 | desc->irq_data.chip->irq_enable(&desc->irq_data); | 203 | irq_enable(desc); |
204 | return 0; | 204 | return 0; |
205 | } | 205 | } |
206 | 206 | ||
@@ -211,6 +211,16 @@ void irq_shutdown(struct irq_desc *desc) | |||
211 | desc->irq_data.chip->irq_shutdown(&desc->irq_data); | 211 | desc->irq_data.chip->irq_shutdown(&desc->irq_data); |
212 | } | 212 | } |
213 | 213 | ||
214 | void irq_enable(struct irq_desc *desc) | ||
215 | { | ||
216 | desc->irq_data.chip->irq_enable(&desc->irq_data); | ||
217 | } | ||
218 | |||
219 | void irq_disable(struct irq_desc *desc) | ||
220 | { | ||
221 | desc->irq_data.chip->irq_disable(&desc->irq_data); | ||
222 | } | ||
223 | |||
214 | /* | 224 | /* |
215 | * default enable function | 225 | * default enable function |
216 | */ | 226 | */ |