From 813cdf6bf222dbdfd0c7a3fcea87ad456d618426 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 30 Apr 2008 00:05:24 +1000
Subject: [PATCH] --- yaml --- r: 101606 b: refs/heads/master c:
 21451155d8858773ee764e9218de2ca0f4d6fc38 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/of/gpio.c | 38 +-------------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/[refs] b/[refs]
index ba5537a947bb..98984ffbd9cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09e67ca2c523544e6b38aa570a5f62a0cf20b87b
+refs/heads/master: 21451155d8858773ee764e9218de2ca0f4d6fc38
diff --git a/trunk/drivers/of/gpio.c b/trunk/drivers/of/gpio.c
index 000681e98f2c..1c9cab844f10 100644
--- a/trunk/drivers/of/gpio.c
+++ b/trunk/drivers/of/gpio.c
@@ -137,38 +137,6 @@ int of_gpio_simple_xlate(struct of_gpio_chip *of_gc, struct device_node *np,
 }
 EXPORT_SYMBOL(of_gpio_simple_xlate);
 
-/* Should be sufficient for now, later we'll use dynamic bases. */
-#if defined(CONFIG_PPC32) || defined(CONFIG_SPARC32)
-#define GPIOS_PER_CHIP 32
-#else
-#define GPIOS_PER_CHIP 64
-#endif
-
-static int of_get_gpiochip_base(struct device_node *np)
-{
-	struct device_node *gc = NULL;
-	int gpiochip_base = 0;
-
-	while ((gc = of_find_all_nodes(gc))) {
-		if (!of_get_property(gc, "gpio-controller", NULL))
-			continue;
-
-		if (gc != np) {
-			gpiochip_base += GPIOS_PER_CHIP;
-			continue;
-		}
-
-		of_node_put(gc);
-
-		if (gpiochip_base >= ARCH_NR_GPIOS)
-			return -ENOSPC;
-
-		return gpiochip_base;
-	}
-
-	return -ENOENT;
-}
-
 /**
  * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank)
  * @np:		device node of the GPIO chip
@@ -205,11 +173,7 @@ int of_mm_gpiochip_add(struct device_node *np,
 	if (!mm_gc->regs)
 		goto err1;
 
-	gc->base = of_get_gpiochip_base(np);
-	if (gc->base < 0) {
-		ret = gc->base;
-		goto err1;
-	}
+	gc->base = -1;
 
 	if (!of_gc->xlate)
 		of_gc->xlate = of_gpio_simple_xlate;