From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Mon, 6 Aug 2012 08:09:15 +0000 Subject: [PATCH v3 4/9] GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip() In-Reply-To: References: <1343470061-16879-1-git-send-email-zonque@gmail.com> Message-ID: <201208060809.15527.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sunday 05 August 2012, Linus Walleij wrote: > >>> > >>> +#ifdef CONFIG_ARCH_PXA > >>> + if (gpio_is_pxa_type(gpio_type)) > >>> + irq_base = PXA_GPIO_TO_IRQ(0); > >>> +#endif > >>> +#ifdef CONFIG_ARCH_MMP > >>> + if (gpio_is_mmp_type(gpio_type)) > >>> + irq_base = MMP_GPIO_TO_IRQ(0); > >>> +#endif > >> > >> Grrr. Can we think of a way to get rid of these #ifdef:s? > >> > > > > It's used for non-DT mode. This driver is used in both arch-pxa > > and arch-mmp. Since we use static irq allocation in non-DT mode, > > we have to use this kind of code to get irq_base. > > > > What Daniel did is only simplifying the code. > > Yep I know, and the result is better than without the patch, so > I Acked it. But if I have my dreams come true we could do away > with this compile-time stuff as well... I think the real solution for these is to merge ARCH_PXA and ARCH_MMP and move all the code into one directory. I think it's ok to have the above hack in there in the meantime as long as we can agree on where we're heading eventually. Arnd