From: David Daney Date: Thu, 5 Jul 2012 16:12:37 +0000 (+0200) Subject: MIPS: Octeon: Remove use of OCTEON_IRQ_RST. X-Git-Tag: firefly_0821_release~3680^2~2305^2^5~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0b28b823ac5bd4f9b2876ce9432ff2006c529f06;p=firefly-linux-kernel-4.4.55.git MIPS: Octeon: Remove use of OCTEON_IRQ_RST. This symbol will be removed, so don't use it as part of the definition of OCTEON_IRQ_LAST. Set OCTEON_IRQ_LAST to 127 so there is space for all the automatically allocated (via irq_domain) irqs. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3946/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/include/asm/mach-cavium-octeon/irq.h index 5b05f186e395..81a032490b92 100644 --- a/arch/mips/include/asm/mach-cavium-octeon/irq.h +++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h @@ -86,6 +86,9 @@ enum octeon_irq { OCTEON_IRQ_LMC0, OCTEON_IRQ_DFM = OCTEON_IRQ_LMC0 + 4, /* Summary of DFM */ OCTEON_IRQ_RST, +#ifndef CONFIG_PCI_MSI + OCTEON_IRQ_LAST = 127 +#endif }; #ifdef CONFIG_PCI_MSI @@ -94,8 +97,6 @@ enum octeon_irq { #define OCTEON_IRQ_MSI_LAST (OCTEON_IRQ_MSI_BIT0 + 255) #define OCTEON_IRQ_LAST (OCTEON_IRQ_MSI_LAST + 1) -#else -#define OCTEON_IRQ_LAST (OCTEON_IRQ_RST + 1) #endif #endif