From: Neil Armstrong <narmstrong@baylibre.com>
To: Felipe Balbi <balbi@ti.com>,
Thierry Reding <thierry.reding@gmail.com>,
Tony Lindgren <tony@atomide.com>,
linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Grant Erickson <marathon96@gmail.com>, NeilBrown <neilb@suse.de>,
Joachim Eastwood <manabian@gmail.com>
Subject: Re: [RFC PATCH 1/3] arm: plat-omap: dmtimer: Add clock source from DT
Date: Mon, 19 Oct 2015 14:41:26 +0200 [thread overview]
Message-ID: <5624E4F6.5000308@baylibre.com> (raw)
In-Reply-To: <87k2qmlt38.fsf@saruman.tx.rr.com>
Hi,
On 10/16/2015 05:40 PM, Felipe Balbi wrote:
>> +static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer)
>> +{
>> + int ret;
>> + struct clk *parent;
>> +
>> + if (unlikely(!timer))
>> + return -EINVAL;
>
> IMO, let this crash. If this happens we have bigger problems.
>
>> + if (IS_ERR(timer->fclk))
>> + return -EINVAL;
>
> We bail out if we can't get fclk, this check is unnecessary.
Sure, I will remove the checks.
This was also breaking OMAP1, fclk must be checked against NULL here to detect OMAP1 and return -ENODEV;
>
>> + parent = clk_get(&timer->pdev->dev, NULL);
>
> why NULL ? You could use something more descriptive, but no strong
> feelings.
Actually, I just wanted the "default" clock for this device, NULL will select the first OF clock found.
If we specify a name, we should also specify it in the DT as clock-names, is it desired ?
If you feel I should name it somehow... I don't want it to conflict all the HWMOD clk namings actually.
>
>> + if (IS_ERR(parent))
>> + return -ENODEV;
>> +
>> + ret = clk_set_parent(timer->fclk, parent);
>> + if (ret < 0)
>> + pr_err("%s: failed to set parent\n", __func__);
>> +
>> + clk_put(parent);
>> +
>> + return ret;
>> +}
>> +
>> static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
>> {
>> - int rc;
>> + int rc, ret;
>
> doesn't seem like you need this extra 'ret' variable. Just use 'rc'.
>
>> @@ -166,7 +190,11 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
>> __omap_dm_timer_enable_posted(timer);
>> omap_dm_timer_disable(timer);
>>
>> - return omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
>> + ret = omap_dm_timer_of_set_source(timer);
>> + if (ret < 0 && ret == -ENODEV)
>
> this < 0 check is pointless if you're going to check for equality to -ENODEV
Sure, I was certainly tired, this was a so stupid mistake...
Neil
WARNING: multiple messages have this Message-ID (diff)
From: narmstrong@baylibre.com (Neil Armstrong)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 1/3] arm: plat-omap: dmtimer: Add clock source from DT
Date: Mon, 19 Oct 2015 14:41:26 +0200 [thread overview]
Message-ID: <5624E4F6.5000308@baylibre.com> (raw)
In-Reply-To: <87k2qmlt38.fsf@saruman.tx.rr.com>
Hi,
On 10/16/2015 05:40 PM, Felipe Balbi wrote:
>> +static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer)
>> +{
>> + int ret;
>> + struct clk *parent;
>> +
>> + if (unlikely(!timer))
>> + return -EINVAL;
>
> IMO, let this crash. If this happens we have bigger problems.
>
>> + if (IS_ERR(timer->fclk))
>> + return -EINVAL;
>
> We bail out if we can't get fclk, this check is unnecessary.
Sure, I will remove the checks.
This was also breaking OMAP1, fclk must be checked against NULL here to detect OMAP1 and return -ENODEV;
>
>> + parent = clk_get(&timer->pdev->dev, NULL);
>
> why NULL ? You could use something more descriptive, but no strong
> feelings.
Actually, I just wanted the "default" clock for this device, NULL will select the first OF clock found.
If we specify a name, we should also specify it in the DT as clock-names, is it desired ?
If you feel I should name it somehow... I don't want it to conflict all the HWMOD clk namings actually.
>
>> + if (IS_ERR(parent))
>> + return -ENODEV;
>> +
>> + ret = clk_set_parent(timer->fclk, parent);
>> + if (ret < 0)
>> + pr_err("%s: failed to set parent\n", __func__);
>> +
>> + clk_put(parent);
>> +
>> + return ret;
>> +}
>> +
>> static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
>> {
>> - int rc;
>> + int rc, ret;
>
> doesn't seem like you need this extra 'ret' variable. Just use 'rc'.
>
>> @@ -166,7 +190,11 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
>> __omap_dm_timer_enable_posted(timer);
>> omap_dm_timer_disable(timer);
>>
>> - return omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
>> + ret = omap_dm_timer_of_set_source(timer);
>> + if (ret < 0 && ret == -ENODEV)
>
> this < 0 check is pointless if you're going to check for equality to -ENODEV
Sure, I was certainly tired, this was a so stupid mistake...
Neil
next prev parent reply other threads:[~2015-10-19 12:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 12:27 [RFC PATCH 1/3] arm: plat-omap: dmtimer: Add clock source from DT Neil Armstrong
2015-10-16 12:27 ` Neil Armstrong
2015-10-16 15:40 ` Felipe Balbi
2015-10-16 15:40 ` Felipe Balbi
2015-10-16 15:40 ` Felipe Balbi
2015-10-19 12:41 ` Neil Armstrong [this message]
2015-10-19 12:41 ` Neil Armstrong
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=5624E4F6.5000308@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=marathon96@gmail.com \
--cc=neilb@suse.de \
--cc=thierry.reding@gmail.com \
--cc=tony@atomide.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.