On Tuesday, August 09, 2011 1:08 AM, Russell King wrote: > > Consolidate 24 trivial gpiolib implementions out of mach/gpio.h > into asm/gpio.h. This is basically the include of asm-generic/gpio.h > and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep > as described in Documentation/gpio.txt > > Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> > --- > arch/arm/include/asm/gpio.h | 10 ++++++++++ > arch/arm/mach-ep93xx/include/mach/gpio.h | 7 +------ > > diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h > index 166a7a3..15e8970 100644 > --- a/arch/arm/include/asm/gpio.h > +++ b/arch/arm/include/asm/gpio.h > @@ -4,4 +4,14 @@ > /* not all ARM platforms necessarily support this API ... */ > #include <mach/gpio.h> > > +#ifdef __ARM_GPIOLIB_TRIVIAL > +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ > +#include <asm-generic/gpio.h> > + > +/* The trivial gpiolib dispatchers */ > +#define gpio_get_value __gpio_get_value > +#define gpio_set_value __gpio_set_value > +#define gpio_cansleep __gpio_cansleep > +#endif > + > #endif /* _ARCH_ARM_GPIO_H */ > diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h > index c57152c..fbc770e 100644 > --- a/arch/arm/mach-ep93xx/include/mach/gpio.h > +++ b/arch/arm/mach-ep93xx/include/mach/gpio.h > @@ -100,12 +100,7 @@ > #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) > > /* new generic GPIO API - see Documentation/gpio.txt */ > - > -#include <asm-generic/gpio.h> > - > -#define gpio_get_value __gpio_get_value > -#define gpio_set_value __gpio_set_value > -#define gpio_cansleep __gpio_cansleep > +#define __ARM_GPIOLIB_TRIVIAL > > /* > * Map GPIO A0..A7 (0..7) to irq 64..71, For ep93xx: Acked-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
