From 0d14bc0ec4f8017e49ab5d2d91c45f5957afc31d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 6 Aug 2015 12:57:13 +0200 Subject: [PATCH] gpio: Drop asm-generic/gpio.h Since we no longer have custom gpio function prototypes we can drop the prototypes from asm-generic/gpio.h can add them to include/gpio.h instead. While at it add static inline dummy wrappers for !CONFIG_GENERIC_GPIO so that code using gpios can compile without gpio support. Signed-off-by: Sascha Hauer --- arch/arm/include/asm/gpio.h | 10 -------- arch/arm/mach-at91/include/mach/gpio.h | 2 -- arch/arm/mach-ep93xx/include/mach/gpio.h | 1 - arch/arm/mach-mxs/include/mach/gpio.h | 21 ----------------- arch/arm/mach-pxa/include/mach/gpio.h | 1 - arch/arm/mach-samsung/include/mach/gpio.h | 18 --------------- arch/mips/include/asm/gpio.h | 6 ----- arch/ppc/boards/freescale-p1010rdb/p1010rdb.c | 2 +- arch/ppc/boards/geip-da923rc/da923rc.c | 1 + arch/ppc/mach-mpc85xx/include/mach/gpio.h | 2 -- include/asm-generic/gpio.h | 9 -------- include/gpio.h | 23 ++++++++++++++++++- 12 files changed, 24 insertions(+), 72 deletions(-) delete mode 100644 arch/arm/include/asm/gpio.h delete mode 100644 arch/arm/mach-ep93xx/include/mach/gpio.h delete mode 100644 arch/arm/mach-mxs/include/mach/gpio.h delete mode 100644 arch/arm/mach-samsung/include/mach/gpio.h delete mode 100644 arch/mips/include/asm/gpio.h delete mode 100644 include/asm-generic/gpio.h diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h deleted file mode 100644 index b3c1efe73..000000000 --- a/arch/arm/include/asm/gpio.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ARCH_ARM_GPIO_H -#define _ARCH_ARM_GPIO_H - -#ifndef CONFIG_GPIOLIB -#include -#else -#include -#endif - -#endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 4e9d6865a..bdc0cb687 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -7,8 +7,6 @@ #ifndef __AT91_GPIO_H__ #define __AT91_GPIO_H__ -#include - #define MAX_NB_GPIO_PER_BANK 32 static inline unsigned pin_to_bank(unsigned pin) diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f..000000000 --- a/arch/arm/mach-ep93xx/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h deleted file mode 100644 index 8643c98d5..000000000 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * (C) Copyright 2010 Juergen Beisert - Pengutronix - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef __ASM_MACH_GPIO_H -#define __ASM_MACH_GPIO_H - -#include - -#endif /* __ASM_MACH_GPIO_H */ diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 950bb1a34..e6724e1ca 100644 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h @@ -20,7 +20,6 @@ #ifndef __ASM_ARCH_PXA_GPIO_H #define __ASM_ARCH_PXA_GPIO_H -#include #include #define GPIO_REGS_VIRT (0x40E00000) diff --git a/arch/arm/mach-samsung/include/mach/gpio.h b/arch/arm/mach-samsung/include/mach/gpio.h deleted file mode 100644 index 39206676f..000000000 --- a/arch/arm/mach-samsung/include/mach/gpio.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __ASM_MACH_GPIO_H -#define __ASM_MACH_GPIO_H - -#include - -#endif /* __ASM_MACH_GPIO_H */ diff --git a/arch/mips/include/asm/gpio.h b/arch/mips/include/asm/gpio.h deleted file mode 100644 index 41a9589f8..000000000 --- a/arch/mips/include/asm/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ARCH_MIPS_GPIO_H -#define _ARCH_MIPS_GPIO_H - -#include - -#endif /* _ARCH_MIPS_GPIO_H */ diff --git a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c index 5bae5849c..60cae46d2 100644 --- a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c +++ b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/arch/ppc/boards/geip-da923rc/da923rc.c b/arch/ppc/boards/geip-da923rc/da923rc.c index 3d77349e0..b6b5d56ac 100644 --- a/arch/ppc/boards/geip-da923rc/da923rc.c +++ b/arch/ppc/boards/geip-da923rc/da923rc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/ppc/mach-mpc85xx/include/mach/gpio.h b/arch/ppc/mach-mpc85xx/include/mach/gpio.h index 61f634922..b41ecc521 100644 --- a/arch/ppc/mach-mpc85xx/include/mach/gpio.h +++ b/arch/ppc/mach-mpc85xx/include/mach/gpio.h @@ -10,8 +10,6 @@ #ifndef _MACH_PPC_GPIO_H #define _MACH_PPC_GPIO_H -#include - extern void fsl_enable_gpiout(void); #endif /* _MACH_PPC_GPIO_H */ diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h deleted file mode 100644 index 767497096..000000000 --- a/include/asm-generic/gpio.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __ASM_GENERIC_GPIO_H -#define __ASM_GENERIC_GPIO_H - -void gpio_set_value(unsigned gpio, int value); -int gpio_get_value(unsigned gpio); -int gpio_direction_output(unsigned gpio, int value); -int gpio_direction_input(unsigned gpio); - -#endif /* __ASM_GENERIC_GPIO_H */ diff --git a/include/gpio.h b/include/gpio.h index f116ea6af..7b3f512b1 100644 --- a/include/gpio.h +++ b/include/gpio.h @@ -1,7 +1,28 @@ #ifndef __GPIO_H #define __GPIO_H -#include +#ifdef CONFIG_GENERIC_GPIO +void gpio_set_value(unsigned gpio, int value); +int gpio_get_value(unsigned gpio); +int gpio_direction_output(unsigned gpio, int value); +int gpio_direction_input(unsigned gpio); +#else +static inline void gpio_set_value(unsigned gpio, int value) +{ +} +static inline int gpio_get_value(unsigned gpio) +{ + return 0; +} +static inline int gpio_direction_output(unsigned gpio, int value) +{ + return -EINVAL; +} +static inline int gpio_direction_input(unsigned gpio) +{ + return -EINVAL; +} +#endif #define ARCH_NR_GPIOS 256