diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 20:50:49 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:48:04 +0200 |
| commit | f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 (patch) | |
| tree | 70ef12c19f05f7d149132dce9c656641a1d3f4ad | |
| parent | 33776b009a45c8e921c47ea2d8304104677ee778 (diff) | |
| download | op-kernel-dev-f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6.zip op-kernel-dev-f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6.tar.gz | |
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>
| -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 3fbf4bf..ba2760d 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -137,7 +137,7 @@ static void migrate_irqs(void) struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); - if (desc->status == IRQ_DISABLED) + if (irqd_irq_disabled(data)) continue; /* diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index cbb4e54..7f399f9 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) pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; /* Don't force an interrupt if the irq has been disabled */ - if (!(irq_desc[sn_irq_info->irq_irq].status & IRQ_DISABLED) && + if (!irqd_irq_disabled(sn_irq_info->irq_irq) && pci_provider && pci_provider->force_interrupt) (*pci_provider->force_interrupt)(sn_irq_info); } |
