From: Zhou Yanjie <zhouyanjie@wanyeetech.com>
To: Paul Cercueil <paul@crapouillou.net>
Cc: daniel.lezcano@linaro.org, tglx@linutronix.de,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
dongsheng.qiu@ingenic.com, aric.pzqi@ingenic.com,
rick.tyliu@ingenic.com, sihui.liu@ingenic.com,
jun.jiang@ingenic.com, sernia.zhou@foxmail.com
Subject: Re: [PATCH] clocksource: Ingenic: Improve the code.
Date: Sat, 24 Jul 2021 23:38:31 +0800 [thread overview]
Message-ID: <ac16a2ef-2532-acb0-7599-7d6a4ac1b95f@wanyeetech.com> (raw)
In-Reply-To: <OQZQWQ.MUGEDOGBXJW12@crapouillou.net>
Hi Paul,
On 2021/7/24 下午7:54, Paul Cercueil wrote:
> Hi Zhou,
>
> Thanks! I actually had a similar patch locally that I was eventually
> going to send.
>
>
> Le sam., juil. 24 2021 at 18:10:07 +0800, 周琰杰 (Zhou Yanjie)
> <zhouyanjie@wanyeetech.com> a écrit :
>> Use "FIELD_GET()" and "FIELD_PREP()" to simplify the code.
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> ---
>> drivers/clocksource/ingenic-sysost.c | 11 +++++------
>> 1 file changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/clocksource/ingenic-sysost.c
>> b/drivers/clocksource/ingenic-sysost.c
>> index a129840..1fbea59 100644
>> --- a/drivers/clocksource/ingenic-sysost.c
>> +++ b/drivers/clocksource/ingenic-sysost.c
>> @@ -4,6 +4,7 @@
>> * Copyright (c) 2020 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> */
>>
>> +#include <linux/bitfield.h>
>> #include <linux/bitops.h>
>> #include <linux/clk.h>
>> #include <linux/clk-provider.h>
>> @@ -34,8 +35,6 @@
>> /* bits within the OSTCCR register */
>> #define OSTCCR_PRESCALE1_MASK 0x3
>> #define OSTCCR_PRESCALE2_MASK 0xc
>> -#define OSTCCR_PRESCALE1_LSB 0
>> -#define OSTCCR_PRESCALE2_LSB 2
>>
>> /* bits within the OSTCR register */
>> #define OSTCR_OST1CLR BIT(0)
>> @@ -98,7 +97,7 @@ static unsigned long
>> ingenic_ost_percpu_timer_recalc_rate(struct clk_hw *hw,
>>
>> prescale = readl(ost_clk->ost->base + info->ostccr_reg);
>>
>> - prescale = (prescale & OSTCCR_PRESCALE1_MASK) >>
>> OSTCCR_PRESCALE1_LSB;
>> + prescale = FIELD_GET(OSTCCR_PRESCALE1_MASK, prescale);
>>
>> return parent_rate >> (prescale * 2);
>> }
>> @@ -112,7 +111,7 @@ static unsigned long
>> ingenic_ost_global_timer_recalc_rate(struct clk_hw *hw,
>>
>> prescale = readl(ost_clk->ost->base + info->ostccr_reg);
>>
>> - prescale = (prescale & OSTCCR_PRESCALE2_MASK) >>
>> OSTCCR_PRESCALE2_LSB;
>> + prescale = FIELD_GET(OSTCCR_PRESCALE2_MASK, prescale);
>>
>> return parent_rate >> (prescale * 2);
>> }
>> @@ -151,7 +150,7 @@ static int
>> ingenic_ost_percpu_timer_set_rate(struct clk_hw *hw, unsigned long re
>> int val;
>>
>> val = readl(ost_clk->ost->base + info->ostccr_reg);
>> - val = (val & ~OSTCCR_PRESCALE1_MASK) | (prescale <<
>> OSTCCR_PRESCALE1_LSB);
>> + val = (val & ~OSTCCR_PRESCALE1_MASK) |
>> FIELD_PREP(OSTCCR_PRESCALE1_MASK, prescale);
>
> Just one nitpick, I'd prefer this:
>
> val ~= &OSTCCR_PRESCALE1_MASK;
> val |= FIELD_PREP(OSTCCR_PRESCALE1_MASK, prescale);
Sure, I will change it in the next version.
>
>> writel(val, ost_clk->ost->base + info->ostccr_reg);
>>
>> return 0;
>> @@ -166,7 +165,7 @@ static int
>> ingenic_ost_global_timer_set_rate(struct clk_hw *hw, unsigned long re
>> int val;
>>
>> val = readl(ost_clk->ost->base + info->ostccr_reg);
>> - val = (val & ~OSTCCR_PRESCALE2_MASK) | (prescale <<
>> OSTCCR_PRESCALE2_LSB);
>> + val = (val & ~OSTCCR_PRESCALE2_MASK) |
>> FIELD_PREP(OSTCCR_PRESCALE2_MASK, prescale);
>
> Same here.
Sure.
Thanks and best regards!
>
> Cheers,
> -Paul
>
>> writel(val, ost_clk->ost->base + info->ostccr_reg);
>>
>> return 0;
>> --
>> 2.7.4
>>
>
prev parent reply other threads:[~2021-07-24 15:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-24 10:10 周琰杰 (Zhou Yanjie)
2021-07-24 11:54 ` Paul Cercueil
2021-07-24 15:38 ` Zhou Yanjie [this message]
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=ac16a2ef-2532-acb0-7599-7d6a4ac1b95f@wanyeetech.com \
--to=zhouyanjie@wanyeetech.com \
--cc=aric.pzqi@ingenic.com \
--cc=daniel.lezcano@linaro.org \
--cc=dongsheng.qiu@ingenic.com \
--cc=jun.jiang@ingenic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paul@crapouillou.net \
--cc=rick.tyliu@ingenic.com \
--cc=sernia.zhou@foxmail.com \
--cc=sihui.liu@ingenic.com \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®