Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
  powerpc: Fix CHRP PCI config access for indirect_pci
  powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
  powerpc: Fix 32-bit SMP boot on CHRP
  powerpc: Fix link errors on 32-bit machines using legacy DMA
  powerpc/pci: Improve detection of unassigned bridge resources
  hvc_console: Fix free_irq in spinlocked section
  powerpc: Get USE_STRICT_MM_TYPECHECKS working again
  powerpc: Reflect the used arguments in machine_init() prototype
  powerpc: Fix DMA offset for non-coherent DMA
  powerpc: fix fsl_upm nand driver modular build
  powerpc/83xx: add NAND support for the MPC8360E-RDK boards
  powerpc: FPGA support for GE Fanuc SBC610
  i2c: MPC8349E-mITX Power Management and GPIO expander driver
  powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
  powerpc: document the "fsl,ssi-dma-channel" compatible property
  powerpc: disable CHRP and PMAC support in various defconfigs
  OF: add fsl,mcu-mpc8349emitx to the exception list
  powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
  powerpc: remove support for bootmem-allocated memory for the DIU driver
  powerpc: remove non-dependent load fsl_booke PTE_64BIT
  ...

1 files changed, 19 insertions, 62 deletions

diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index 1c9cab844f10..7cd7301b5839 100644
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -28,78 +28,35 @@
  */
 int of_get_gpio(struct device_node *np, int index)
 {
-        int ret = -EINVAL;
+        int ret;
         struct device_node *gc;
         struct of_gpio_chip *of_gc = NULL;
         int size;
-        const u32 *gpios;
-        u32 nr_cells;
-        int i;
         const void *gpio_spec;
         const u32 *gpio_cells;
-        int gpio_index = 0;
 
-        gpios = of_get_property(np, "gpios", &size);
-        if (!gpios) {
-                ret = -ENOENT;
+        ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index,
+                                          &gc, &gpio_spec);
+        if (ret) {
+                pr_debug("%s: can't parse gpios property\n", __func__);
                 goto err0;
         }
-        nr_cells = size / sizeof(u32);
-
-        for (i = 0; i < nr_cells; gpio_index++) {
-                const phandle *gpio_phandle;
-
-                gpio_phandle = gpios + i;
-                gpio_spec = gpio_phandle + 1;
-
-                /* one cell hole in the gpios = <>; */
-                if (!*gpio_phandle) {
-                        if (gpio_index == index)
-                                return -ENOENT;
-                        i++;
-                        continue;
-                }
-
-                gc = of_find_node_by_phandle(*gpio_phandle);
-                if (!gc) {
-                        pr_debug("%s: could not find phandle for gpios\n",
-                                 np->full_name);
-                        goto err0;
-                }
-
-                of_gc = gc->data;
-                if (!of_gc) {
-                        pr_debug("%s: gpio controller %s isn't registered\n",
-                                 np->full_name, gc->full_name);
-                        goto err1;
-                }
-
-                gpio_cells = of_get_property(gc, "#gpio-cells", &size);
-                if (!gpio_cells || size != sizeof(*gpio_cells) ||
-                                *gpio_cells != of_gc->gpio_cells) {
-                        pr_debug("%s: wrong #gpio-cells for %s\n",
-                                 np->full_name, gc->full_name);
-                        goto err1;
-                }
-
-                /* Next phandle is at phandle cells + #gpio-cells */
-                i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;
-                if (i >= nr_cells + 1) {
-                        pr_debug("%s: insufficient gpio-spec length\n",
-                                 np->full_name);
-                        goto err1;
-                }
-
-                if (gpio_index == index)
-                        break;
-
-                of_gc = NULL;
-                of_node_put(gc);
-        }
 
+        of_gc = gc->data;
         if (!of_gc) {
-                ret = -ENOENT;
-                goto err0;
+                pr_debug("%s: gpio controller %s isn't registered\n",
+                         np->full_name, gc->full_name);
+                ret = -ENODEV;
+                goto err1;
+        }
+
+        gpio_cells = of_get_property(gc, "#gpio-cells", &size);
+        if (!gpio_cells || size != sizeof(*gpio_cells) ||
+                        *gpio_cells != of_gc->gpio_cells) {
+                pr_debug("%s: wrong #gpio-cells for %s\n",
+                         np->full_name, gc->full_name);
+                ret = -EINVAL;
+                goto err1;
         }
 
         ret = of_gc->xlate(of_gc, np, gpio_spec);