Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[sfrench/cifs-2.6.git] / drivers / of / gpio.c

diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index 000681e98f2c2d8ef6df123ab8026cc0caca751f..1c9cab844f10aaa60cf80d9996b4782d0c1256e6 100644 (file)
--- a/drivers/of/gpio.c
+++ b/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;