Skip to content

Commit

Permalink
OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value
Browse files Browse the repository at this point in the history
The previous clock API was returning a standard linux error code in
case of failure. This is not the case anymore with the new
omap_clk_get_by_name API. A NULL value means that the clock node
does not exist.
Replace all the IS_ERR check by a !clk check.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Benoit Cousson authored and Paul Walmsley committed May 20, 2010
1 parent 682fdc9 commit 4d3ae5a
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions arch/arm/mach-omap2/omap_hwmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ static int _init_main_clk(struct omap_hwmod *oh)
return 0;

c = omap_clk_get_by_name(oh->main_clk);
WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get main_clk %s\n",
WARN(!c, "omap_hwmod: %s: cannot clk_get main_clk %s\n",
oh->name, oh->main_clk);
if (IS_ERR(c))
if (!c)
ret = -EINVAL;
oh->_clk = c;

Expand Down Expand Up @@ -446,9 +446,9 @@ static int _init_interface_clks(struct omap_hwmod *oh)
continue;

c = omap_clk_get_by_name(os->clk);
WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get "
"interface_clk %s\n", oh->name, os->clk);
if (IS_ERR(c))
WARN(!c, "omap_hwmod: %s: cannot clk_get interface_clk %s\n",
oh->name, os->clk);
if (!c)
ret = -EINVAL;
os->_clk = c;
}
Expand All @@ -472,9 +472,9 @@ static int _init_opt_clks(struct omap_hwmod *oh)

for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
c = omap_clk_get_by_name(oc->clk);
WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get opt_clk "
"%s\n", oh->name, oc->clk);
if (IS_ERR(c))
WARN(!c, "omap_hwmod: %s: cannot clk_get opt_clk %s\n",
oh->name, oc->clk);
if (!c)
ret = -EINVAL;
oc->_clk = c;
}
Expand All @@ -495,15 +495,15 @@ static int _enable_clocks(struct omap_hwmod *oh)

pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);

if (oh->_clk && !IS_ERR(oh->_clk))
if (oh->_clk)
clk_enable(oh->_clk);

if (oh->slaves_cnt > 0) {
for (i = 0; i < oh->slaves_cnt; i++) {
struct omap_hwmod_ocp_if *os = oh->slaves[i];
struct clk *c = os->_clk;

if (c && !IS_ERR(c) && (os->flags & OCPIF_SWSUP_IDLE))
if (c && (os->flags & OCPIF_SWSUP_IDLE))
clk_enable(c);
}
}
Expand All @@ -525,15 +525,15 @@ static int _disable_clocks(struct omap_hwmod *oh)

pr_debug("omap_hwmod: %s: disabling clocks\n", oh->name);

if (oh->_clk && !IS_ERR(oh->_clk))
if (oh->_clk)
clk_disable(oh->_clk);

if (oh->slaves_cnt > 0) {
for (i = 0; i < oh->slaves_cnt; i++) {
struct omap_hwmod_ocp_if *os = oh->slaves[i];
struct clk *c = os->_clk;

if (c && !IS_ERR(c) && (os->flags & OCPIF_SWSUP_IDLE))
if (c && (os->flags & OCPIF_SWSUP_IDLE))
clk_disable(c);
}
}
Expand Down Expand Up @@ -1013,7 +1013,7 @@ static int _setup(struct omap_hwmod *oh)
struct omap_hwmod_ocp_if *os = oh->slaves[i];
struct clk *c = os->_clk;

if (!c || IS_ERR(c))
if (!c)
continue;

if (os->flags & OCPIF_SWSUP_IDLE) {
Expand Down

0 comments on commit 4d3ae5a

Please sign in to comment.