[PATCH 07/22] OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed
Sergei Shtylyov
sshtylyov at mvista.com
Fri May 21 06:00:43 EDT 2010
Hello.
Paul Walmsley wrote:
> From: Benoit Cousson <b-cousson at ti.com>
> The WARN is a little bit too verbose and is not providing
> usefull information in that case.
> Signed-off-by: Benoit Cousson <b-cousson at ti.com>
> Signed-off-by: Paul Walmsley <paul at pwsan.com>
[...]
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index a62920b..5d3a3ea 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -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(!c, "omap_hwmod: %s: cannot clk_get main_clk %s\n",
> - oh->name, oh->main_clk);
> if (!c)
> + pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",
> + oh->name, oh->main_clk);
> ret = -EINVAL;
Don't you need {} around the statements here?
> oh->_clk = c;
>
> @@ -446,9 +446,9 @@ static int _init_interface_clks(struct omap_hwmod *oh)
> continue;
>
> c = omap_clk_get_by_name(os->clk);
> - WARN(!c, "omap_hwmod: %s: cannot clk_get interface_clk %s\n",
> - oh->name, os->clk);
> if (!c)
> + pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
> + oh->name, os->clk);
> ret = -EINVAL;
Likewise here...
> os->_clk = c;
> }
> @@ -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(!c, "omap_hwmod: %s: cannot clk_get opt_clk %s\n",
> - oh->name, oc->clk);
> if (!c)
> + pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
> + oh->name, oc->clk);
> ret = -EINVAL;
... and here.
WBR, Sergei
More information about the linux-arm-kernel
mailing list