From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baruch Siach Subject: Re: [Linux-Xtensa] [PATCH] xtensa: move NO_IRQ definition into asm/irq.h Date: Thu, 12 Sep 2013 08:15:52 +0300 Message-ID: <20130912051552.GZ4644@tarshish> References: <1378962366-26818-1-git-send-email-jcmvbkbc@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from guitar.tcltek.co.il ([192.115.133.116]:60463 "EHLO sivan.tkos.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751346Ab3ILFYd (ORCPT ); Thu, 12 Sep 2013 01:24:33 -0400 Content-Disposition: inline In-Reply-To: <1378962366-26818-1-git-send-email-jcmvbkbc@gmail.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Max Filippov Cc: Chris Zankel , linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org 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 > --- > 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 -