From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Date: Wed, 17 Apr 2013 20:34:12 +0000 (+0200)
Subject: ARM: OMAP2+: only WARN if a GPMC child probe function fail
X-Git-Tag: firefly_0821_release~3680^2~505^2~3^2~4^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b327b3627bb428eb7d98f25224532425a673d89e;p=firefly-linux-kernel-4.4.55.git

ARM: OMAP2+: only WARN if a GPMC child probe function fail

If any of the GPMC child nodes fails, this shouldn't make the
whole gpmc_probe_dt() function to fail. It is better to just
WARN and allow other devices probe function to succeed.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 6166847a3244..6c4da1254f53 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1533,10 +1533,9 @@ static int gpmc_probe_dt(struct platform_device *pdev)
 			 of_node_cmp(child->name, "nor") == 0)
 			ret = gpmc_probe_generic_child(pdev, child);
 
-		if (ret < 0) {
+		if (WARN(ret < 0, "%s: probing gpmc child %s failed\n",
+			 __func__, child->full_name))
 			of_node_put(child);
-			return ret;
-		}
 	}
 
 	return 0;