From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from caramon.arm.linux.org.uk (caramon.arm.linux.org.uk [IPv6:2002:4e20:1eda::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 44A77B6F92 for ; Fri, 28 Oct 2011 00:55:38 +1100 (EST) Date: Thu, 27 Oct 2011 14:53:53 +0100 From: Russell King - ARM Linux To: Mike Frysinger Subject: Re: [PATCH] asm-generic/gpio.h: merge basic gpiolib wrappers Message-ID: <20111027135353.GM19187@n2100.arm.linux.org.uk> References: <1319528012-19006-1-git-send-email-broonie@opensource.wolfsonmicro.com> <1319720503-3183-1-git-send-email-vapier@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1319720503-3183-1-git-send-email-vapier@gentoo.org> Sender: Russell King - ARM Linux Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, linux@lists.openrisc.net, Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Guan Xuetao , Hans-Christian Egtvedt , Jonas Bonn , x86@kernel.org, Ingo Molnar , linux-arch@vger.kernel.org, Matt Turner , Haavard Skinnemoen , Fenghua Yu , microblaze-uclinux@itee.uq.edu.au, linux-m68k@lists.linux-m68k.org, Ivan Kokshaysky , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Richard Henderson , Chris Zankel , Michal Simek , Tony Luck , Mark Brown , linux-kernel@vger.kernel.org, Ralf Baechle , Paul Mundt , linux-alpha@vger.kernel.org, uclinux-dist-devel@blackfin.uclinux.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, Oct 27, 2011 at 09:01:43AM -0400, Mike Frysinger wrote: > diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h > index 11ad0bf..741efb2 100644 > --- a/arch/arm/include/asm/gpio.h > +++ b/arch/arm/include/asm/gpio.h > @@ -5,14 +5,15 @@ > #include > > #ifndef __ARM_GPIOLIB_COMPLEX > +/* assume the mach has defined this */ > +#ifndef irq_to_gpio > +#define irq_to_gpio irq_to_gpio > +#endif Oh, this isn't a valid assumption either - it's far from valid. Those sub-architectures which don't define __ARM_GPIOLIB_COMPLEX probably don't define any kind of irq_to_gpio function by any means. Some of our mach/gpio.h header files for sub-architectures using entirely gpiolib are entirely empty - and we want them to stay that way.