Revert "ARM: ixp4xx: fix gpio rework"

This reverts commit 48ba81f6fdb7580a5c474da1b14a338e1358e6ab.

A better fix was sent by Krzysztof Halasa.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index eef39c7ad0cfbf523c3a756161e526daec9395f5..df82a2b4a546aaf7a4e99492712abaef6720a90c 100644 (file)
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -100,7 +100,7 @@ void __init ixp4xx_map_io(void)
 #define IXP4XX_GPIO_CLK_0              14
 #define IXP4XX_GPIO_CLK_1              15
 
-void gpio_line_config(u8 line, u32 direction)
+static void gpio_line_config(u8 line, u32 direction)
 {
        if (direction == IXP4XX_GPIO_IN)
                *IXP4XX_GPIO_GPOER |= (1 << line);
@@ -108,12 +108,12 @@ void gpio_line_config(u8 line, u32 direction)
                *IXP4XX_GPIO_GPOER &= ~(1 << line);
 }
 
-void gpio_line_get(u8 line, int *value)
+static void gpio_line_get(u8 line, int *value)
 {
        *value = (*IXP4XX_GPIO_GPINR >> line) & 0x1;
 }
 
-void gpio_line_set(u8 line, int value)
+static void gpio_line_set(u8 line, int value)
 {
        if (value == IXP4XX_GPIO_HIGH)
            *IXP4XX_GPIO_GPOUTR |= (1 << line);

diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c
index 5a635c657ea2c17cede979f4b2f575e8f7f56d42..e54ff491c105fd0949238a9127abff04069216f6 100644 (file)
--- a/arch/arm/mach-ixp4xx/goramo_mlr.c
+++ b/arch/arm/mach-ixp4xx/goramo_mlr.c
@@ -17,13 +17,6 @@
 #include <asm/mach/pci.h>
 #include <asm/system_info.h>
 
-#define IXP4XX_GPIO_OUT                0x1
-#define IXP4XX_GPIO_IN                 0x2
-
-void gpio_line_config(u8 line, u32 direction);
-void gpio_line_get(u8 line, int *value);
-void gpio_line_set(u8 line, int value);
-
 #define SLOT_ETHA              0x0B    /* IDSEL = AD21 */
 #define SLOT_ETHB              0x0C    /* IDSEL = AD20 */
 #define SLOT_MPCI              0x0D    /* IDSEL = AD19 */