Re: [PATCH] gpio: add GPIOF_ values regardless on kconfig settings

From: Grant Likely
Date: Fri May 27 2011 - 16:12:12 EST


On Fri, May 27, 2011 at 10:46:57AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
>
> Make GPIOF_ defined values available even when GPIOLIB nor GENERIC_GPIO
> is enabled by moving them to <linux/gpio.h>.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Applied, thanks.

g.

> ---
> include/asm-generic/gpio.h | 10 ----------
> include/linux/gpio.h | 11 +++++++++++
> 2 files changed, 11 insertions(+), 10 deletions(-)
>
> --- linux-next-20110523.orig/include/asm-generic/gpio.h
> +++ linux-next-20110523/include/asm-generic/gpio.h
> @@ -170,16 +170,6 @@ extern int __gpio_cansleep(unsigned gpio
>
> extern int __gpio_to_irq(unsigned gpio);
>
> -#define GPIOF_DIR_OUT (0 << 0)
> -#define GPIOF_DIR_IN (1 << 0)
> -
> -#define GPIOF_INIT_LOW (0 << 1)
> -#define GPIOF_INIT_HIGH (1 << 1)
> -
> -#define GPIOF_IN (GPIOF_DIR_IN)
> -#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW)
> -#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
> -
> /**
> * struct gpio - a structure describing a GPIO with configuration
> * @gpio: the GPIO number
> --- linux-next-20110523.orig/include/linux/gpio.h
> +++ linux-next-20110523/include/linux/gpio.h
> @@ -3,6 +3,17 @@
>
> /* see Documentation/gpio.txt */
>
> +/* make these flag values available regardless of GPIO kconfig options */
> +#define GPIOF_DIR_OUT (0 << 0)
> +#define GPIOF_DIR_IN (1 << 0)
> +
> +#define GPIOF_INIT_LOW (0 << 1)
> +#define GPIOF_INIT_HIGH (1 << 1)
> +
> +#define GPIOF_IN (GPIOF_DIR_IN)
> +#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW)
> +#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH)
> +
> #ifdef CONFIG_GENERIC_GPIO
> #include <asm/gpio.h>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/