]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
OMAP: hwmod: Replace WARN by pr_warning for clockdomain check
authorBenoit Cousson <b-cousson@ti.com>
Thu, 20 May 2010 18:31:10 +0000 (12:31 -0600)
committerPaul Walmsley <paul@pwsan.com>
Thu, 20 May 2010 18:31:10 +0000 (12:31 -0600)
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>
arch/arm/mach-omap2/omap_hwmod.c

index b6031e468defe92c12fa7cfbe3be26069acac572..2fff39ff408093db866f7caf4c985063aebec083 100644 (file)
@@ -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)
 {
-       struct clk *c;
        int ret = 0;
 
        if (!oh->main_clk)
                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",
                           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;
 }