diff options
author | Michal Simek <monstr@monstr.eu> | 2011-12-21 07:10:24 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 02:34:31 -0500 |
commit | 18e3b1075b1bc4a6027a6612fe70a5c81c209ec7 (patch) | |
tree | 19a57256f56656a16ae459a9cf2ba4c84fca52f9 /arch/microblaze | |
parent | be3bad6f5eb7205753e0134aeb422c4d9c1d8838 (diff) |
microblaze: Remove NO_IRQ from architecture
NO_IRQ shouldn't be used by any driver. All Microblaze
drivers are fixed that's why NO_IRQ can be removed.
Also fix pci-common.c which has references to NO_IRQ removed.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Reviewed-by: Ryan Mallon <rmallon@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/irq.h | 2 | ||||
-rw-r--r-- | arch/microblaze/pci/pci-common.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h index b116a825de77..a175132e4496 100644 --- a/arch/microblaze/include/asm/irq.h +++ b/arch/microblaze/include/asm/irq.h | |||
@@ -27,8 +27,6 @@ typedef unsigned long irq_hw_number_t; | |||
27 | 27 | ||
28 | extern unsigned int nr_irq; | 28 | extern unsigned int nr_irq; |
29 | 29 | ||
30 | #define NO_IRQ 0 | ||
31 | |||
32 | struct pt_regs; | 30 | struct pt_regs; |
33 | extern void do_IRQ(struct pt_regs *regs); | 31 | extern void do_IRQ(struct pt_regs *regs); |
34 | 32 | ||
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index db841c7b9d5b..0d71b2ed8107 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
@@ -242,7 +242,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) | |||
242 | line, pin); | 242 | line, pin); |
243 | 243 | ||
244 | virq = irq_create_mapping(NULL, line); | 244 | virq = irq_create_mapping(NULL, line); |
245 | if (virq != NO_IRQ) | 245 | if (virq) |
246 | irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW); | 246 | irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW); |
247 | } else { | 247 | } else { |
248 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", | 248 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", |
@@ -253,7 +253,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) | |||
253 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, | 253 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, |
254 | oirq.size); | 254 | oirq.size); |
255 | } | 255 | } |
256 | if (virq == NO_IRQ) { | 256 | if (!virq) { |
257 | pr_debug(" Failed to map !\n"); | 257 | pr_debug(" Failed to map !\n"); |
258 | return -1; | 258 | return -1; |
259 | } | 259 | } |