From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754776AbcESN3q (ORCPT ); Thu, 19 May 2016 09:29:46 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:59749 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753433AbcESN3p (ORCPT ); Thu, 19 May 2016 09:29:45 -0400 From: Arnd Bergmann To: Sylvain Lemieux Cc: Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij Subject: Re: [PATCH] ARM: lpc32xx: fix NR_IRQS confict Date: Thu, 19 May 2016 15:29:14 +0200 Message-ID: <3344142.lW8euGrkl5@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1463659769.14963.4.camel@localhost> References: <1463646968-1047336-1-git-send-email-arnd@arndb.de> <573D8F92.3010902@mleia.com> <1463659769.14963.4.camel@localhost> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:1M8yPD+GhPvhOboIL1Dkg853+TjyzyzUrLPA4xSpw7bb0yxrb+H IQXVcEeDNN55X0avrCkX7MUdWI6n5atOHh6OBK8FaPpIpvw9VdZOZ1iC6sSwoWZpqdDK3dZ KiqRYIdKybsUDEA8/sxkbaL4CM8wKfVapH0KHEJzF243t1Zjf72btnM+h2ICpsH9FPoA1p2 UViVg9R+TcsK+P3r6eG/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:bmIvhqATPjA=:5kYGgW9rKhjKhwid+/5aI3 LkgMH1O9DWmZ7MAFjjn/PBqxjxt0KJg3ukJz1NIc7vJiicZimbMGUH8rycVrHQTTWTbi/C0Zp g7KzocdUi0TSUJgcmrmwUXWVZhbW2zFEi1rbEw/AaCKaZYDQ/OTAAEnvbaiGOAC0eUwM8dFCh rhl3LA5SZ3nw46qxvR9f8EBPiEhTjkcOtcKwufJkFnY6k5GjwOWGrIaFgpUL0KIFiHIHAm6Z3 BXOPWo5scLNDfOIDJSt3nMtEDWwyBunCRW/zebsNmhxvPu56TiOT0usCyng8q0Q0rDV/Gg3Pz EzEM4oUB1wLl6ICtyPdCdhCFcbERdylotQUjm5CZGKmKwwYQ/eVO1pIGWs3FJv2WHs2cdpCbB k9zIJ7PxKHlcxoDYRMW4OB+NNMV9MjnFip1Lzeq31k4j3WwSiXcFWaN9rJjp37+atH3aZMAiL W4S9/KCvCtvxru61UzDTQiM1ngETpbk2zmOSd5662/V0b5NEKLjx9uuD3jHV1kjwIwmW4cgxC iUSNiy1pVZua6iPRNfgBr+5BiDJVfiakKQJG++gQt/Vx4CQ/vooO1Tn2URDv773rFlmDIuPAY 2TObCrjnBKi8nQeh6cq88TOtKsy9qQKFWN+qp3N1kEF083cviKCG3T4dGGp1Ewr7mXptFOEYt EtHrj0c//WAy9V8JmF/+s+ASxiaR+MBVC3WaeWKXEQX1zB4AS7tajeqceC2m3UJAEAqDELxWk waRlhRkThbPfMfeJkb0iPKzitetap8YpR3iNzg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 19 May 2016 08:09:29 Sylvain Lemieux wrote: > Hi Arnd, > > On Thu, 2016-05-19 at 13:04 +0300, Vladimir Zapolskiy wrote: > > 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. Ok, I've applied that on the next/late branch for arm-soc now, and one patch on top that removes the NR_IRQS definition from mach/irqs.h > I also submitted a patch that remove this warning at the source > (GPIO driver broken to_irq support), until the GPIO driver update is > done. > > Please refer to this link: > http://thread.gmane.org/gmane.linux.kernel.gpio/16837 This is in another subsystem, so I'm not applying this to arm-soc, but the warning should be gone with my one-line change to remove NR_IRQS anyway. Linus, if you want to put it in the gpio tree for v4.7, feel free to add my Acked-by: Arnd Bergmann , otherwise I guess it's enough to have this in v4.8. Arnd