davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann 2016-09-03 00:52:11 +02:00
commit 9064a1c77d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/memory/omap-gpmc.c
View File

@ -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);