xtensa: move NO_IRQ definition into asm/irq.h
Max Filippov
maintainerPATCH 1/1 xtensa: move NO_IRQ definition into asm/irq.h
This fixes the following allmodconfig build error:
sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_probe':sound/soc/fsl/fsl_ssi.c:939:26: error: 'NO_IRQ' undeclared (first use in this function)
--- arch/xtensa/include/asm/irq.h | 4 ++++ .../platforms/xtfpga/include/platform/hardware.h | 4 ---- arch/xtensa/variants/s6000/include/variant/irq.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-)
arch/xtensa/include/asm/irq.h +4 -0
@@ -22,6 +22,10 @@ static inline void variant_irq_enable(unsigned int irq) { }static inline void variant_irq_disable (unsigned int irq) { }#endif +#ifndef NO_IRQ +#define NO_IRQ ((unsigned int)(-1)) +#endif +#ifndef VARIANT_NR_IRQS # define VARIANT_NR_IRQS 0#endif
arch/xtensa/platforms/xtfpga/include/platform/hardware.h +0 -4
@@ -15,10 +15,6 @@#ifndef __XTENSA_XTAVNET_HARDWARE_H#define __XTENSA_XTAVNET_HARDWARE_H -/* By default NO_IRQ is defined to 0 in Linux, but we use the -interrupt 0 for UART... */ -#define NO_IRQ -1 -/* Memory configuration. */ #define PLATFORM_DEFAULT_MEM_START 0x00000000
arch/xtensa/variants/s6000/include/variant/irq.h +0 -1
@@ -1,7 +1,6 @@#ifndef _XTENSA_S6000_IRQ_H#define _XTENSA_S6000_IRQ_H -#define NO_IRQ (-1)#define VARIANT_NR_IRQS 8/* GPIO interrupts */ extern void variant_irq_enable (unsigned int irq);
Signature · 1 line
1.7.7.6
Hi Max,
Quoted 4 lines · Max Filippov
This fixes the following allmodconfig build error:
sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_probe':sound/soc/fsl/fsl_ssi.c:939:26: error: 'NO_IRQ' undeclared (first use in this function)
The fsl_ssi driver is buggy here. irq_of_parse_and_map() returns 0 on error, not NO_IRQ. Also, see http://lwn.net/Articles/470820/.
baruch
Quoted 49 lines
Signed-off-by Max Filippov <[email protected]>--- arch/xtensa/include/asm/irq.h | 4 ++++ .../platforms/xtfpga/include/platform/hardware.h | 4 ---- arch/xtensa/variants/s6000/include/variant/irq.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-)arch/xtensa/include/asm/irq.h +4
-0@@ -22,6 +22,10 @@ static inline void variant_irq_enable(unsigned int irq) { }static inline void variant_irq_disable (unsigned int irq) { }#endif +#ifndef NO_IRQ +#define NO_IRQ ((unsigned int)(-1)) +#endif +#ifndef VARIANT_NR_IRQS # define VARIANT_NR_IRQS 0#endif arch/xtensa/platforms/xtfpga/include/platform/hardware.h +0
-4@@ -15,10 +15,6 @@#ifndef __XTENSA_XTAVNET_HARDWARE_H#define __XTENSA_XTAVNET_HARDWARE_H -/* By default NO_IRQ is defined to 0 in Linux, but we use the -interrupt 0 for UART... */ -#define NO_IRQ -1 -/* Memory configuration. */ #define PLATFORM_DEFAULT_MEM_START 0x00000000arch/xtensa/variants/s6000/include/variant/irq.h +0
-1@@ -1,7 +1,6 @@#ifndef _XTENSA_S6000_IRQ_H#define _XTENSA_S6000_IRQ_H -#define NO_IRQ (-1)#define VARIANT_NR_IRQS 8/* GPIO interrupts */ extern void variant_irq_enable (unsigned int irq);
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.2.679.5364, http://www.tkos.co.il -Max Filippov
maintainerQuoted 10 lines · Baruch Siach
Hi Max,
Quoted 4 lines · Max Filippov
This fixes the following allmodconfig build error:
sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_probe':sound/soc/fsl/fsl_ssi.c:939:26: error: 'NO_IRQ' undeclared (first use in this function)The
fsl_ssidriver is buggy here.irq_of_parse_and_map()returns 0 on error, notNO_IRQ. Also, see http://lwn.net/Articles/470820/.
Ok, I'll post another one with NO_IRQ defined as 0 in order to allow building allmodconfig.
Signature · 2 lines
Thanks. -- Max