|
@@ -2185,7 +2185,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;
|
|
@@ -2200,11 +2200,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)
|
|
@@ -2212,9 +2212,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 */
|
|
|
|
|
@@ -2369,16 +2368,10 @@ static int gpmc_probe(struct platform_device *pdev)
|
|
|
goto setup_irq_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:
|