From: Thomas Gleixner Date: Fri, 25 Mar 2011 19:50:49 +0000 (+0100) Subject: ia64: Use irqd_irq_disabled() instead of desc->status access X-Git-Tag: Ubuntu-5.2.0-15.16~21325^2~56 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6;p=mirror_ubuntu-eoan-kernel.git ia64: Use irqd_irq_disabled() instead of desc->status access Remove the last open coded access to irq_desc. Signed-off-by: Thomas Gleixner --- 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) 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 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) 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); }