Browse Source

OMAP: hwmod: Replace WARN by pr_warning for clockdomain check

Most of the clock nodes belong to a clock domain, but it is perfectly valid
to have clock without clock domain.
Root clocks for example does not belong to any clock domain.
Keep the warning but reduce the verbosity.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Benoit Cousson 15 years ago
parent
commit
6340338423
1 changed files with 6 additions and 7 deletions
  1. 6 7
      arch/arm/mach-omap2/omap_hwmod.c

+ 6 - 7
arch/arm/mach-omap2/omap_hwmod.c

@@ -404,21 +404,20 @@ static int _del_initiator_dep(struct omap_hwmod *oh, struct omap_hwmod *init_oh)
  */
  */
 static int _init_main_clk(struct omap_hwmod *oh)
 static int _init_main_clk(struct omap_hwmod *oh)
 {
 {
-	struct clk *c;
 	int ret = 0;
 	int ret = 0;
 
 
 	if (!oh->main_clk)
 	if (!oh->main_clk)
 		return 0;
 		return 0;
 
 
-	c = omap_clk_get_by_name(oh->main_clk);
-	if (!c)
+	oh->_clk = omap_clk_get_by_name(oh->main_clk);
+	if (!oh->_clk)
 		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",
 		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",
 			   oh->name, oh->main_clk);
 			   oh->name, oh->main_clk);
-		ret = -EINVAL;
-	oh->_clk = c;
+		return -EINVAL;
 
 
-	WARN(!c->clkdm, "omap_hwmod: %s: missing clockdomain for %s.\n",
-	     oh->main_clk, c->name);
+	if (!oh->_clk->clkdm)
+		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",
+			   oh->main_clk, oh->_clk->name);
 
 
 	return ret;
 	return ret;
 }
 }