From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH 10/22] OMAP: hwmod: Replace WARN by pr_warning for clockdomain check Date: Fri, 21 May 2010 14:02:15 +0400 Message-ID: <4BF65A27.9030603@ru.mvista.com> References: <20100519021800.19716.8938.stgit@localhost.localdomain> <20100519021848.19716.50002.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:52140 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752476Ab0EUKDF (ORCPT ); Fri, 21 May 2010 06:03:05 -0400 Received: by wyg36 with SMTP id 36so531496wyg.19 for ; Fri, 21 May 2010 03:03:03 -0700 (PDT) In-Reply-To: <20100519021848.19716.50002.stgit@localhost.localdomain> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Benoit Cousson Hello. Paul Walmsley wrote: > From: Benoit Cousson > 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 > Signed-off-by: Paul Walmsley [...] > 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? WBR, Sergei