[PATCH 10/22] OMAP: hwmod: Replace WARN by pr_warning for clockdomain check

Sergei Shtylyov sshtylyov at mvista.com
Fri May 21 06:23:53 EDT 2010


Hello.

I wrote:

>> From: Benoit Cousson <b-cousson at ti.com>

>> 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 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 b6031e4..2fff39f 100644
>> --- a/arch/arm/mach-omap2/omap_hwmod.c
>> +++ b/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)
>>  {
>> -    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;

>    Don't you need {} here again?

    Looks like the original file misses them too, so it needs fixing in 
a  separate patch perhaps...

WBR, Sergei




More information about the linux-arm-kernel mailing list