From: Matteo Croce <rootkit85@yahoo.it>
Date: Sun, 13 Jan 2008 20:13:08 +0000 (+0000)
Subject: gpio: revert it back, wrong and useless
X-Git-Tag: v19.07.0-rc1~37882
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af9cf4a7a8fe91d1d7253c1b32e2caab8fbd0331;p=openwrt%2Fstaging%2Fhauke.git

gpio: revert it back, wrong and useless

SVN-Revision: 10181
---

diff --git a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
index 00418b5863..2e19fcae9d 100644
--- a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
+++ b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
@@ -28,26 +28,18 @@ extern void gpio_free(unsigned gpio);
 /* Common GPIO layer */
 static inline int gpio_get_value(unsigned gpio)
 {
-	static unsigned addr;
+	void __iomem *gpio_in =
+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
 
-	if (!addr) {
-		void __iomem *gpio_in = (void __iomem *)
-				KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
-		addr = readl(gpio_in);
-	}
-
-	return addr & (1 << gpio);
+	return readl(gpio_in) & (1 << gpio);
 }
 
 static inline void gpio_set_value(unsigned gpio, int value)
 {
-	static void __iomem *gpio_out;
+	void __iomem *gpio_out =
+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
 	unsigned tmp;
 
-	if (!gpio_out)
-		gpio_out = (void __iomem *)
-				KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
-
 	tmp = readl(gpio_out) & ~(1 << gpio);
 	if (value)
 		tmp |= 1 << gpio;