From: Jon Hunter <jon-hunter@ti.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Tony Lindgren <tony@atomide.com>,
linux-omap <linux-omap@vger.kernel.org>,
Vaibhav Bedia <vaibhav.bedia@ti.com>,
linux-arm <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH V2 3/7] ARM: OMAP2+: Remove hard-coded test on timer ID
Date: Mon, 4 Feb 2013 12:01:59 -0600 [thread overview]
Message-ID: <510FF797.8000406@ti.com> (raw)
In-Reply-To: <20130204174612.GF2637@n2100.arm.linux.org.uk>
On 02/04/2013 11:46 AM, Russell King - ARM Linux wrote:
> On Mon, Feb 04, 2013 at 11:43:02AM -0600, Jon Hunter wrote:
>> @@ -280,22 +281,22 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
>> if (IS_ERR(timer->fclk))
>> return -ENODEV;
>>
>> - /* FIXME: Need to remove hard-coded test on timer ID */
>> - if (gptimer_id != 12) {
>> - struct clk *src;
>> -
>> - src = clk_get(NULL, fck_source);
>> - if (IS_ERR(src)) {
>> - r = -EINVAL;
>> - } else {
>> - r = clk_set_parent(timer->fclk, src);
>> - if (IS_ERR_VALUE(r))
>> - pr_warn("%s: %s cannot set source\n",
>> - __func__, oh->name);
>> + src = clk_get(NULL, fck_source);
>> + if (IS_ERR(src))
>> + return -EINVAL;
>
> This should be:
> return PTR_ERR(src);
>
> and should've been there previously...
Thanks for the catch. I will include this and resend.
Cheers
Jon
WARNING: multiple messages have this Message-ID (diff)
From: jon-hunter@ti.com (Jon Hunter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 3/7] ARM: OMAP2+: Remove hard-coded test on timer ID
Date: Mon, 4 Feb 2013 12:01:59 -0600 [thread overview]
Message-ID: <510FF797.8000406@ti.com> (raw)
In-Reply-To: <20130204174612.GF2637@n2100.arm.linux.org.uk>
On 02/04/2013 11:46 AM, Russell King - ARM Linux wrote:
> On Mon, Feb 04, 2013 at 11:43:02AM -0600, Jon Hunter wrote:
>> @@ -280,22 +281,22 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
>> if (IS_ERR(timer->fclk))
>> return -ENODEV;
>>
>> - /* FIXME: Need to remove hard-coded test on timer ID */
>> - if (gptimer_id != 12) {
>> - struct clk *src;
>> -
>> - src = clk_get(NULL, fck_source);
>> - if (IS_ERR(src)) {
>> - r = -EINVAL;
>> - } else {
>> - r = clk_set_parent(timer->fclk, src);
>> - if (IS_ERR_VALUE(r))
>> - pr_warn("%s: %s cannot set source\n",
>> - __func__, oh->name);
>> + src = clk_get(NULL, fck_source);
>> + if (IS_ERR(src))
>> + return -EINVAL;
>
> This should be:
> return PTR_ERR(src);
>
> and should've been there previously...
Thanks for the catch. I will include this and resend.
Cheers
Jon
next prev parent reply other threads:[~2013-02-04 18:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-04 17:42 [PATCH V2 0/7] ARM: OMAP2+: System timer updates Jon Hunter
2013-02-04 17:42 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 1/7] ARM: OMAP2+: Fix selection of clockevent timer when using device-tree Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 2/7] ARM: OMAP2+: Display correct system timer name Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 3/7] ARM: OMAP2+: Remove hard-coded test on timer ID Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:46 ` Russell King - ARM Linux
2013-02-04 17:46 ` Russell King - ARM Linux
2013-02-04 18:01 ` Jon Hunter [this message]
2013-02-04 18:01 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 4/7] ARM: OMAP2+: Simplify system timer clock definitions Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 5/7] ARM: OMAP2+: Simplify system timers definitions Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 6/7] ARM: OMAP2+: Store ID of system timers in timer structure Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:43 ` [PATCH V2 7/7] ARM: OMAP4+: Fix sparse warning in system timers Jon Hunter
2013-02-04 17:43 ` Jon Hunter
2013-02-04 17:47 ` [PATCH V2 0/7] ARM: OMAP2+: System timer updates Jon Hunter
2013-02-04 17:47 ` Jon Hunter
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=510FF797.8000406@ti.com \
--to=jon-hunter@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=tony@atomide.com \
--cc=vaibhav.bedia@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.