* [PATCH v2] xtensa: define NO_IRQ as 0, remove other definitions
@ 2013-09-12 7:17 Max Filippov
2013-09-12 7:26 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Max Filippov @ 2013-09-12 7:17 UTC (permalink / raw)
To: Chris Zankel
Cc: Marc Gauthier, Baruch Siach, linux-xtensa, linux-arch,
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)
Previous definitions (-1) were correct when used as a hardware IRQ number,
but are incorrect as a mapped IRQ number.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
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(-)
diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h
index 268eec5..56a9503 100644
--- a/arch/xtensa/include/asm/irq.h
+++ b/arch/xtensa/include/asm/irq.h
@@ -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
diff --git a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
index 4060297..42a731b 100644
--- a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
+++ b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h
@@ -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
diff --git a/arch/xtensa/variants/s6000/include/variant/irq.h b/arch/xtensa/variants/s6000/include/variant/irq.h
index 97d6fc4..39ca751 100644
--- a/arch/xtensa/variants/s6000/include/variant/irq.h
+++ b/arch/xtensa/variants/s6000/include/variant/irq.h
@@ -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);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] xtensa: define NO_IRQ as 0, remove other definitions
2013-09-12 7:17 [PATCH v2] xtensa: define NO_IRQ as 0, remove other definitions Max Filippov
@ 2013-09-12 7:26 ` Geert Uytterhoeven
2013-09-12 7:43 ` Max Filippov
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2013-09-12 7:26 UTC (permalink / raw)
To: Max Filippov
Cc: Chris Zankel, Marc Gauthier, Baruch Siach,
linux-xtensa@linux-xtensa.org, Linux-Arch
On Thu, Sep 12, 2013 at 9:17 AM, Max Filippov <jcmvbkbc@gmail.com> wrote:
>
> 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.
>
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
> 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 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] xtensa: define NO_IRQ as 0, remove other definitions
2013-09-12 7:26 ` Geert Uytterhoeven
@ 2013-09-12 7:43 ` Max Filippov
0 siblings, 0 replies; 3+ messages in thread
From: Max Filippov @ 2013-09-12 7:43 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Chris Zankel, Marc Gauthier, Baruch Siach,
linux-xtensa@linux-xtensa.org, Linux-Arch
On Thu, Sep 12, 2013 at 11:26 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Sep 12, 2013 at 9:17 AM, Max Filippov <jcmvbkbc@gmail.com> wrote:
>>
>> 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.
>>
>> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
>> ---
>> 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) {
I agree, this needs to be fixed too.
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-12 7:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-12 7:17 [PATCH v2] xtensa: define NO_IRQ as 0, remove other definitions Max Filippov
2013-09-12 7:26 ` Geert Uytterhoeven
2013-09-12 7:43 ` Max Filippov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).