From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754529AbcESKEI (ORCPT ); Thu, 19 May 2016 06:04:08 -0400 Received: from mleia.com ([178.79.152.223]:57160 "EHLO mail.mleia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754181AbcESKEG (ORCPT ); Thu, 19 May 2016 06:04:06 -0400 Subject: Re: [PATCH] ARM: lpc32xx: fix NR_IRQS confict To: Arnd Bergmann , Sylvain Lemieux References: <1463646968-1047336-1-git-send-email-arnd@arndb.de> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij From: Vladimir Zapolskiy Message-ID: <573D8F92.3010902@mleia.com> Date: Thu, 19 May 2016 13:04:02 +0300 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 In-Reply-To: <1463646968-1047336-1-git-send-email-arnd@arndb.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-49551924 X-CRM114-CacheID: sfid-20160519_111043_284920_E419727F X-CRM114-Status: GOOD ( 14.50 ) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, On 19.05.2016 11:35, Arnd Bergmann wrote: > With the change to sparse IRQs, the lpc32xx platform gets a warning about > conflicting macros: > > In file included from arch/arm/mach-lpc32xx/irq.c:31:0: > arch/arm/mach-lpc32xx/include/mach/irqs.h:115:0: warning: "NR_IRQS" redefined > #define NR_IRQS 96 > arch/arm/include/asm/irq.h:9:0: note: this is the location of the previous definition > #define NR_IRQS NR_IRQS_LEGACY > > In the irq controller driver, we surely need the local number instead of > the generic NR_IRQS definition, so I'm renaming that one to LPC32XX_NR_IRQS. > > Signed-off-by: Arnd Bergmann > Fixes: 8cb17b5ed017 ("irqchip: Add LPC32xx interrupt controller driver") I think that the entire removal of arch/arm/mach-lpc32xx/irq.c is the proper fix, since it is a dead code now - http://www.spinics.net/lists/arm-kernel/msg499976.html I believe you can apply that change and add Fixes: tag. -- With best wishes, Vladimir