diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 15:50:49 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 08:48:04 -0400 |
commit | f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 (patch) | |
tree | 70ef12c19f05f7d149132dce9c656641a1d3f4ad /arch/ia64 | |
parent | 33776b009a45c8e921c47ea2d8304104677ee778 (diff) |
ia64: Use irqd_irq_disabled() instead of desc->status access
Remove the last open coded access to irq_desc.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 3fbf4bf93c67..ba2760d99e9f 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -137,7 +137,7 @@ static void migrate_irqs(void) | |||
137 | struct irq_data *data = irq_desc_get_irq_data(desc); | 137 | struct irq_data *data = irq_desc_get_irq_data(desc); |
138 | struct irq_chip *chip = irq_data_get_irq_chip(data); | 138 | struct irq_chip *chip = irq_data_get_irq_chip(data); |
139 | 139 | ||
140 | if (desc->status == IRQ_DISABLED) | 140 | if (irqd_irq_disabled(data)) |
141 | continue; | 141 | continue; |
142 | 142 | ||
143 | /* | 143 | /* |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index cbb4e5406310..7f399f9d99c7 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -412,7 +412,7 @@ sn_call_force_intr_provider(struct sn_irq_info *sn_irq_info) | |||
412 | pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; | 412 | pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; |
413 | 413 | ||
414 | /* Don't force an interrupt if the irq has been disabled */ | 414 | /* Don't force an interrupt if the irq has been disabled */ |
415 | if (!(irq_desc[sn_irq_info->irq_irq].status & IRQ_DISABLED) && | 415 | if (!irqd_irq_disabled(sn_irq_info->irq_irq) && |
416 | pci_provider && pci_provider->force_interrupt) | 416 | pci_provider && pci_provider->force_interrupt) |
417 | (*pci_provider->force_interrupt)(sn_irq_info); | 417 | (*pci_provider->force_interrupt)(sn_irq_info); |
418 | } | 418 | } |