From 8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 16 Aug 2013 12:46:07 +0200 Subject: [PATCH] ARM: remove include of mach/gpio.h for gpiolib users gpiolib user have nothing to define in their machine specific gpio.h, so do not include it. The only thing they could define would be ARCH_NR_GPIOS, but currently no architecture defines it. Should an architecure feel the need to do it this would be a good opportunity to get rid of this limitation. Signed-off-by: Sascha Hauer --- arch/arm/include/asm/gpio.h | 5 ++++- arch/arm/mach-bcm2835/include/mach/gpio.h | 1 - arch/arm/mach-clps711x/include/mach/gpio.h | 3 --- arch/arm/mach-highbank/include/mach/gpio.h | 1 - arch/arm/mach-imx/include/mach/gpio.h | 6 ------ arch/arm/mach-mvebu/include/mach/gpio.h | 6 ------ arch/arm/mach-omap/include/mach/gpio.h | 1 - arch/arm/mach-tegra/include/mach/gpio.h | 1 - 8 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h delete mode 100644 arch/arm/mach-clps711x/include/mach/gpio.h delete mode 100644 arch/arm/mach-highbank/include/mach/gpio.h delete mode 100644 arch/arm/mach-imx/include/mach/gpio.h delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h delete mode 100644 arch/arm/mach-omap/include/mach/gpio.h delete mode 100644 arch/arm/mach-tegra/include/mach/gpio.h diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 166a7a3e2..b3c1efe73 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,7 +1,10 @@ #ifndef _ARCH_ARM_GPIO_H #define _ARCH_ARM_GPIO_H -/* not all ARM platforms necessarily support this API ... */ +#ifndef CONFIG_GPIOLIB #include +#else +#include +#endif #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/mach-bcm2835/include/mach/gpio.h b/arch/arm/mach-bcm2835/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f..000000000 --- a/arch/arm/mach-bcm2835/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/arm/mach-clps711x/include/mach/gpio.h b/arch/arm/mach-clps711x/include/mach/gpio.h deleted file mode 100644 index 3428fe54b..000000000 --- a/arch/arm/mach-clps711x/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -#include - -#define CLPS711X_GPIO(prt,bit) ((prt) * 8 + (bit)) diff --git a/arch/arm/mach-highbank/include/mach/gpio.h b/arch/arm/mach-highbank/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f..000000000 --- a/arch/arm/mach-highbank/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h deleted file mode 100644 index fee693e55..000000000 --- a/arch/arm/mach-imx/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h deleted file mode 100644 index fee693e55..000000000 --- a/arch/arm/mach-mvebu/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-omap/include/mach/gpio.h b/arch/arm/mach-omap/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f..000000000 --- a/arch/arm/mach-omap/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f..000000000 --- a/arch/arm/mach-tegra/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include