* [PATCH] xtensa: move NO_IRQ definition into asm/irq.h
@ 2013-09-12 5:06 Max Filippov
2013-09-12 5:15 ` [Linux-Xtensa] " Baruch Siach
0 siblings, 1 reply; 3+ messages in thread
From: Max Filippov @ 2013-09-12 5:06 UTC (permalink / raw)
To: Chris Zankel; +Cc: Marc Gauthier, 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)
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 ((unsigned int)(-1))
+#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: [Linux-Xtensa] [PATCH] xtensa: move NO_IRQ definition into asm/irq.h
2013-09-12 5:06 [PATCH] xtensa: move NO_IRQ definition into asm/irq.h Max Filippov
@ 2013-09-12 5:15 ` Baruch Siach
2013-09-12 5:37 ` Max Filippov
0 siblings, 1 reply; 3+ messages in thread
From: Baruch Siach @ 2013-09-12 5:15 UTC (permalink / raw)
To: Max Filippov; +Cc: Chris Zankel, linux-xtensa, linux-arch
Hi Max,
On Thu, Sep 12, 2013 at 09:06:06AM +0400, Max Filippov wrote:
> 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
> 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 ((unsigned int)(-1))
> +#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);
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Linux-Xtensa] [PATCH] xtensa: move NO_IRQ definition into asm/irq.h
2013-09-12 5:15 ` [Linux-Xtensa] " Baruch Siach
@ 2013-09-12 5:37 ` Max Filippov
0 siblings, 0 replies; 3+ messages in thread
From: Max Filippov @ 2013-09-12 5:37 UTC (permalink / raw)
To: Baruch Siach; +Cc: Chris Zankel, linux-xtensa@linux-xtensa.org, Linux-Arch
On Thu, Sep 12, 2013 at 9:15 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> Hi Max,
>
> On Thu, Sep 12, 2013 at 09:06:06AM +0400, Max Filippov wrote:
>> 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/.
Ok, I'll post another one with NO_IRQ defined as 0 in order to allow building
allmodconfig.
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-12 5:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-12 5:06 [PATCH] xtensa: move NO_IRQ definition into asm/irq.h Max Filippov
2013-09-12 5:15 ` [Linux-Xtensa] " Baruch Siach
2013-09-12 5:37 ` 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).