Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers

This is also going to be part of v4.8 and sent as a bugfix,
merging it here to avoid a small conflict against the other
gpmc changes.

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

diff --cc drivers/memory/omap-gpmc.c
index c2c32edfed95eaee52ea618b60d8966286e630dd,f00f3e7422657723ad8f69bd90f76554f8938bb6..5457c361ad586424050c98958bdefd22a4c17db7
--- 1/drivers/memory/omap-gpmc.c
--- 2/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@@ -2359,19 -2365,15 +2358,13 @@@ static int gpmc_probe(struct platform_d
        rc = gpmc_setup_irq(gpmc);
        if (rc) {
                dev_err(gpmc->dev, "gpmc_setup_irq failed\n");
 -              goto setup_irq_failed;
 +              goto gpio_init_failed;
        }
  
-       rc = gpmc_probe_dt_children(pdev);
-       if (rc < 0) {
-               dev_err(gpmc->dev, "failed to probe DT children\n");
-               goto dt_children_failed;
-       }
+       gpmc_probe_dt_children(pdev);
  
        return 0;
  
- dt_children_failed:
-       gpmc_free_irq(gpmc);
 -setup_irq_failed:
 -      gpmc_gpio_exit(gpmc);
  gpio_init_failed:
        gpmc_mem_exit();
        pm_runtime_put_sync(&pdev->dev);