diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-09-03 00:52:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-03 00:52:11 +0200 |
| commit | 9064a1c77dd3a5c7288b0254a336d6f4073cd996 (patch) | |
| tree | 18d84e2dabc88c0882c2f6cf7e3ce2d8ac17d312 /drivers/memory/omap-gpmc.c | |
| parent | Merge tag 'reset-for-4.9' of git://git.pengutronix.de/git/pza/linux into next/drivers (diff) | |
| parent | memory: omap-gpmc: allow probe of child nodes to fail (diff) | |
| download | linux-dev-9064a1c77dd3a5c7288b0254a336d6f4073cd996.tar.xz linux-dev-9064a1c77dd3a5c7288b0254a336d6f4073cd996.zip | |
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>
Diffstat (limited to 'drivers/memory/omap-gpmc.c')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index c2c32edfed95..5457c361ad58 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -2183,7 +2183,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) return 0; } -static int gpmc_probe_dt_children(struct platform_device *pdev) +static void gpmc_probe_dt_children(struct platform_device *pdev) { int ret; struct device_node *child; @@ -2198,11 +2198,11 @@ static int gpmc_probe_dt_children(struct platform_device *pdev) else ret = gpmc_probe_generic_child(pdev, child); - if (ret) - return ret; + if (ret) { + dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n", + child->name, ret); + } } - - return 0; } #else static int gpmc_probe_dt(struct platform_device *pdev) @@ -2210,9 +2210,8 @@ static int gpmc_probe_dt(struct platform_device *pdev) return 0; } -static int gpmc_probe_dt_children(struct platform_device *pdev) +static void gpmc_probe_dt_children(struct platform_device *pdev) { - return 0; } #endif /* CONFIG_OF */ @@ -2362,16 +2361,10 @@ static int gpmc_probe(struct platform_device *pdev) 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); gpio_init_failed: gpmc_mem_exit(); pm_runtime_put_sync(&pdev->dev); |