From: b-cousson@ti•com (Benoit Cousson)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 10/22] OMAP: hwmod: Replace WARN by pr_warning for clockdomain check
Date: Fri, 21 May 2010 12:41:24 +0200 [thread overview]
Message-ID: <4BF66354.4060400@ti.com> (raw)
In-Reply-To: <4BF65F39.4090909@ru.mvista.com>
On 5/21/2010 12:23 PM, Sergei Shtylyov wrote:
> Hello.
>
> I wrote:
>
>>> From: Benoit Cousson<b-cousson@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@ti•com>
>>> Signed-off-by: Paul Walmsley<paul@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...
You're right, the original-original was fine, I messed up this one
during the replacement of WARM ([PATCH 07/22] OMAP: hwmod: Replace WARN
by pr_warning if clock lookup failed) you commented previously.
Thanks,
Benoit
next prev parent reply other threads:[~2010-05-21 10:41 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-19 2:18 [PATCH 00/22] OMAP PRCM/clock/powerdomain/hwmod: remaining patches for 2.6.35 Paul Walmsley
2010-05-19 2:18 ` [PATCH 01/22] OMAP4: hwmod: Replace module & device offsets by absolute clkctrl address Paul Walmsley
2010-05-19 2:18 ` [PATCH 02/22] OMAP: CM: Move MAX_MODULE_READY_TIME to cm.h Paul Walmsley
2010-05-19 2:18 ` [PATCH 03/22] OMAP4: hwmod & CM: Implement the omap4_cm_wait_module_ready function Paul Walmsley
2010-05-19 2:18 ` [PATCH 04/22] OMAP4: hwmod: Replace OCPIF_HAS_IDLEST by HWMOD_NO_IDLEST Paul Walmsley
2010-05-19 2:18 ` [PATCH 05/22] OMAP: hwmod: Fix wrong pointer iteration in oh->slaves Paul Walmsley
2010-05-19 2:18 ` [PATCH 06/22] OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value Paul Walmsley
2010-05-19 2:18 ` [PATCH 07/22] OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed Paul Walmsley
2010-05-21 10:00 ` Sergei Shtylyov
2010-05-21 10:16 ` Benoit Cousson
2010-05-19 2:18 ` [PATCH 08/22] OMAP: hwmod: Do not exit the iteration if one clock init failed Paul Walmsley
2010-05-19 2:18 ` [PATCH 09/22] OMAP: hwmod: Rename hwmod name for the MPU Paul Walmsley
2010-05-19 2:18 ` [PATCH 10/22] OMAP: hwmod: Replace WARN by pr_warning for clockdomain check Paul Walmsley
2010-05-21 10:02 ` Sergei Shtylyov
2010-05-21 10:23 ` Sergei Shtylyov
2010-05-21 10:41 ` Benoit Cousson [this message]
2010-05-19 2:18 ` [PATCH 11/22] OMAP4: CM: Remove non-functional registers in ES1.0 Paul Walmsley
2010-05-19 2:18 ` [PATCH 12/22] OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention Paul Walmsley
2010-05-19 2:18 ` [PATCH 13/22] OMAP4: PRCM: Remove duplicate definition of base addresses Paul Walmsley
2010-05-19 2:18 ` [PATCH 14/22] OMAP4: PRCM: Add offset defines for all PRM registers Paul Walmsley
2010-05-19 2:18 ` [PATCH 15/22] OMAP4: PRCM: Add offset defines for all CM registers Paul Walmsley
2010-05-19 2:18 ` [PATCH 16/22] OMAP4 clock: Support clk_set_parent Paul Walmsley
2010-05-19 2:18 ` [PATCH 17/22] OMAP: timers: Fix clock source names for OMAP4 Paul Walmsley
2010-05-19 2:18 ` [PATCH 18/22] OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains Paul Walmsley
2010-05-19 2:19 ` [PATCH 19/22] OMAP3 clock: add support for setting the divider for sys_clkout2 using clk_set_rate Paul Walmsley
2010-05-19 2:19 ` [PATCH 20/22] OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains Paul Walmsley
2010-05-19 2:19 ` [PATCH 21/22] OMAP powerdomain, hwmod, omap_device: add some credits Paul Walmsley
2010-05-19 2:19 ` [PATCH 22/22] OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y Paul Walmsley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BF66354.4060400@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox