From: Thomas Gleixner <tglx@linutronix.de>
To: linux-ia64@vger.kernel.org
Subject: [patch 21/23] ia64: Provide and use a __irq_is_enabled() helper
Date: Fri, 25 Mar 2011 20:52:03 +0000 [thread overview]
Message-ID: <20110325204516.506729641@linutronix.de> (raw)
Remove the last open coded access to irq_desc.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/ia64/kernel/irq.c | 2 +-
arch/ia64/sn/kernel/irq.c | 2 +-
include/linux/irqdesc.h | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
Index: linux-2.6-tip/arch/ia64/kernel/irq.c
=================================--- linux-2.6-tip.orig/arch/ia64/kernel/irq.c
+++ linux-2.6-tip/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 (!__irq_is_enabled(irq))
continue;
/*
Index: linux-2.6-tip/arch/ia64/sn/kernel/irq.c
=================================--- linux-2.6-tip.orig/arch/ia64/sn/kernel/irq.c
+++ linux-2.6-tip/arch/ia64/sn/kernel/irq.c
@@ -412,7 +412,7 @@ sn_call_force_intr_provider(struct sn_ir
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 (__irq_is_enabled(sn_irq_info->irq_irq) &&
pci_provider && pci_provider->force_interrupt)
(*pci_provider->force_interrupt)(sn_irq_info);
}
Index: linux-2.6-tip/include/linux/irqdesc.h
=================================--- linux-2.6-tip.orig/include/linux/irqdesc.h
+++ linux-2.6-tip/include/linux/irqdesc.h
@@ -231,4 +231,11 @@ __irq_set_preflow_handler(unsigned int i
#endif
#endif
+static inline bool __irq_is_enabled(unsigned int irq)
+{
+ struct irq_desc *desc = irq_to_desc(irq);
+
+ return desc && !desc->depth;
+}
+
#endif
reply other threads:[~2011-03-25 20:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110325204516.506729641@linutronix.de \
--to=tglx@linutronix.de \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox