diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 08:10:52 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-28 10:55:10 -0400 |
commit | 32f4125ebffee4f3c4dbc6a437fc656129eb9e60 (patch) | |
tree | d64c6bb7ba40c33734896303734416ea5b4f3290 /kernel/irq/irqdesc.c | |
parent | c2d0c555c22242c3a76e366074c4d83ef9fa3b8c (diff) |
genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data
We really need these flags for some of the interrupt chips. Move it
from internal state to irq_data and provide proper accessors.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Daney <ddaney@caviumnetworks.com>
Diffstat (limited to 'kernel/irq/irqdesc.c')
-rw-r--r-- | kernel/irq/irqdesc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 96c3268a509d..2c039c9b9383 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c | |||
@@ -81,7 +81,6 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node) | |||
81 | desc->irq_data.msi_desc = NULL; | 81 | desc->irq_data.msi_desc = NULL; |
82 | irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS); | 82 | irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS); |
83 | irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); | 83 | irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); |
84 | desc->istate = IRQS_DISABLED; | ||
85 | desc->handle_irq = handle_bad_irq; | 84 | desc->handle_irq = handle_bad_irq; |
86 | desc->depth = 1; | 85 | desc->depth = 1; |
87 | desc->irq_count = 0; | 86 | desc->irq_count = 0; |
@@ -239,7 +238,6 @@ int __init early_irq_init(void) | |||
239 | 238 | ||
240 | struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = { | 239 | struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = { |
241 | [0 ... NR_IRQS-1] = { | 240 | [0 ... NR_IRQS-1] = { |
242 | .istate = IRQS_DISABLED, | ||
243 | .handle_irq = handle_bad_irq, | 241 | .handle_irq = handle_bad_irq, |
244 | .depth = 1, | 242 | .depth = 1, |
245 | .lock = __RAW_SPIN_LOCK_UNLOCKED(irq_desc->lock), | 243 | .lock = __RAW_SPIN_LOCK_UNLOCKED(irq_desc->lock), |