xtensa: define NO_IRQ as 0, remove other definitions
Max Filippov
maintainerPATCH v2 1/1 xtensa: define NO_IRQ as 0, remove other definitions
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)
Previous definitions (-1) were correct when used as a hardware IRQ number, but are incorrect as a mapped IRQ number.
--- 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 0 +#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
Quoted 7 lines · Max Filippov
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)Previous definitions (-1) were correct when used as a hardware IRQ number, but are incorrect as a mapped IRQ number.
Quoted 6 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(-)
Shouldn't sound/soc/fsl/fsl_ssi.c be changed instead:
-if (ssi_private->irq == NO_IRQ) {
+if (!ssi_private->irq) {
Cfr. the thread https://lkml.org/lkml/2013/7/25/642
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Max Filippov
maintainerQuoted 17 lines · Geert Uytterhoeven
Quoted 7 lines · Max Filippov
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)Previous definitions (-1) were correct when used as a hardware IRQ number, but are incorrect as a mapped IRQ number.
Quoted 6 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(-)Shouldn't
sound/soc/fsl/fsl_ssi.cbe changed instead:
Review
Quoted 2 lines
(quoted diff) +1
-1-if (ssi_private->irq == NO_IRQ) { +if (!ssi_private->irq) {
I agree, this needs to be fixed too.
Quoted 1 line
Cfr. the thread https://lkml.org/lkml/2013/7/25/642
I saw that thread and I don't see that patch applied anywhere.
Thanks.
-- Max