2014-04-07 12:04:37

by Chen Gang

[permalink] [raw]
Subject: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

Need use 'clk' instead of 'mclk', which is the original removed local
variable.

The related original commit:

"652ed95 cpufreq: introduce cpufreq_generic_get() routine"

The related error with allmodconfig for unicore32:

CC drivers/cpufreq/unicore2-cpufreq.o
drivers/cpufreq/unicore2-cpufreq.c: In function ?ucv2_target?:
drivers/cpufreq/unicore2-cpufreq.c:48: error: ?struct cpufreq_policy? has no member named ?mclk?
make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
make[1]: *** [drivers/cpufreq] Error 2
make: *** [drivers] Error 2


Signed-off-by: Chen Gang <[email protected]>
---
drivers/cpufreq/unicore2-cpufreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c
index 13be802..8d045af 100644
--- a/drivers/cpufreq/unicore2-cpufreq.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -45,7 +45,7 @@ static int ucv2_target(struct cpufreq_policy *policy,
freqs.new = target_freq;

cpufreq_freq_transition_begin(policy, &freqs);
- ret = clk_set_rate(policy->mclk, target_freq * 1000);
+ ret = clk_set_rate(policy->clk, target_freq * 1000);
cpufreq_freq_transition_end(policy, &freqs, ret);

return ret;
--
1.7.9.5


2014-04-07 12:08:54

by Viresh Kumar

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On 7 April 2014 17:34, Chen Gang <[email protected]> wrote:
> Need use 'clk' instead of 'mclk', which is the original removed local
> variable.
>
> The related original commit:
>
> "652ed95 cpufreq: introduce cpufreq_generic_get() routine"
>
> The related error with allmodconfig for unicore32:
>
> CC drivers/cpufreq/unicore2-cpufreq.o
> drivers/cpufreq/unicore2-cpufreq.c: In function 'ucv2_target':
> drivers/cpufreq/unicore2-cpufreq.c:48: error: 'struct cpufreq_policy' has no member named 'mclk'
> make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
> make[1]: *** [drivers/cpufreq] Error 2
> make: *** [drivers] Error 2
>
>
> Signed-off-by: Chen Gang <[email protected]>
> ---
> drivers/cpufreq/unicore2-cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Stupid mistake.

Acked-by: Viresh Kumar <[email protected]>

@stable: please apply this for v3.14, as it broke in that cycle..

2014-04-08 01:01:16

by Chen Gang

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On 04/07/2014 08:08 PM, Viresh Kumar wrote:
> On 7 April 2014 17:34, Chen Gang <[email protected]> wrote:
>> Need use 'clk' instead of 'mclk', which is the original removed local
>> variable.
>>
>> The related original commit:
>>
>> "652ed95 cpufreq: introduce cpufreq_generic_get() routine"
>>
>> The related error with allmodconfig for unicore32:
>>
>> CC drivers/cpufreq/unicore2-cpufreq.o
>> drivers/cpufreq/unicore2-cpufreq.c: In function 'ucv2_target':
>> drivers/cpufreq/unicore2-cpufreq.c:48: error: 'struct cpufreq_policy' has no member named 'mclk'
>> make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
>> make[1]: *** [drivers/cpufreq] Error 2
>> make: *** [drivers] Error 2
>>
>>
>> Signed-off-by: Chen Gang <[email protected]>
>> ---
>> drivers/cpufreq/unicore2-cpufreq.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Stupid mistake.
>

It is very easy to lead other members to make mistakes, or let ourself
make mistakes.

> Acked-by: Viresh Kumar <[email protected]>
>
> @stable: please apply this for v3.14, as it broke in that cycle..
>

Thank you.


Thanks.
--
Chen Gang

Open, share, and attitude like air, water, and life which God blessed

2014-04-08 03:14:40

by Guan Xuetao

[permalink] [raw]
Subject: 回复: [PATCH] drivers:cpufreq:uni core32: fix typo issue for 'clk'

Thanks,

Acked-by: Xuetao Guan <[email protected]>

----- Chen Gang <[email protected]> 写道:
> Need use 'clk' instead of 'mclk', which is the original removed local
> variable.
>
> The related original commit:
>
> "652ed95 cpufreq: introduce cpufreq_generic_get() routine"
>
> The related error with allmodconfig for unicore32:
>
> CC drivers/cpufreq/unicore2-cpufreq.o
> drivers/cpufreq/unicore2-cpufreq.c: In function ‘ucv2_target’:
> drivers/cpufreq/unicore2-cpufreq.c:48: error: ‘struct cpufreq_policy’ has no member named ‘mclk’
> make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
> make[1]: *** [drivers/cpufreq] Error 2
> make: *** [drivers] Error 2
>
>
> Signed-off-by: Chen Gang <[email protected]>
> ---
> drivers/cpufreq/unicore2-cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c
> index 13be802..8d045af 100644
> --- a/drivers/cpufreq/unicore2-cpufreq.c
> +++ b/drivers/cpufreq/unicore2-cpufreq.c
> @@ -45,7 +45,7 @@ static int ucv2_target(struct cpufreq_policy *policy,
> freqs.new = target_freq;
>
> cpufreq_freq_transition_begin(policy, &freqs);
> - ret = clk_set_rate(policy->mclk, target_freq * 1000);
> + ret = clk_set_rate(policy->clk, target_freq * 1000);
> cpufreq_freq_transition_end(policy, &freqs, ret);
>
> return ret;
> --
> 1.7.9.5

2014-04-08 04:08:19

by Viresh Kumar

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On 8 April 2014 06:31, Chen Gang <[email protected]> wrote:
>> @stable: please apply this for v3.14, as it broke in that cycle..

This wouldn't work..

> Thank you.

Can you please send it again for stable as well? Add my Ack in the patch
and follow what's mentioned here:

Documentation/stable_kernel_rules.txt

2014-04-08 04:39:56

by Chen Gang

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On 04/08/2014 12:08 PM, Viresh Kumar wrote:
> On 8 April 2014 06:31, Chen Gang <[email protected]> wrote:
>>> @stable: please apply this for v3.14, as it broke in that cycle..
>
> This wouldn't work..
>
>> Thank you.
>
> Can you please send it again for stable as well? Add my Ack in the patch
> and follow what's mentioned here:
>
> Documentation/stable_kernel_rules.txt
>

OK, I will/should try within this week, thanks.


Thanks.
--
Chen Gang

Open, share, and attitude like air, water, and life which God blessed

2014-04-08 05:29:56

by Viresh Kumar

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On 8 April 2014 10:09, Chen Gang <[email protected]> wrote:
> OK, I will/should try within this week, thanks.

Rafael has already applied this patch and has mentioned stable in
'Cc:' field. And it looks it will be applied automatically and you don't
need to do anything now :)


commit b4ddad95020e65cfbbf9aee63d3bcdf682794ade
Author: Chen Gang <[email protected]>
Date: Mon Apr 7 20:04:21 2014 +0800

cpufreq: unicore32: fix typo issue for 'clk'

Need use 'clk' instead of 'mclk', which is the original removed local
variable.

The related original commit:

"652ed95 cpufreq: introduce cpufreq_generic_get() routine"

The related error with allmodconfig for unicore32:

CC drivers/cpufreq/unicore2-cpufreq.o
drivers/cpufreq/unicore2-cpufreq.c: In function 'ucv2_target':
drivers/cpufreq/unicore2-cpufreq.c:48: error: 'struct
cpufreq_policy' has no member named 'mclk'
make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
make[1]: *** [drivers/cpufreq] Error 2
make: *** [drivers] Error 2

Fixes: 652ed95d5fa6 (cpufreq: introduce cpufreq_generic_get() routine)
Signed-off-by: Chen Gang <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
Cc: 3.14+ <[email protected]> # 3.14+
Signed-off-by: Rafael J. Wysocki <[email protected]>

2014-04-08 06:51:39

by Chen Gang

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'


On 04/08/2014 01:29 PM, Viresh Kumar wrote:
> On 8 April 2014 10:09, Chen Gang <[email protected]> wrote:
>> OK, I will/should try within this week, thanks.
>
> Rafael has already applied this patch and has mentioned stable in
> 'Cc:' field. And it looks it will be applied automatically and you don't
> need to do anything now :)
>

OK, thank all of you!!

:-)

>
> commit b4ddad95020e65cfbbf9aee63d3bcdf682794ade
> Author: Chen Gang <[email protected]>
> Date: Mon Apr 7 20:04:21 2014 +0800
>
> cpufreq: unicore32: fix typo issue for 'clk'
>
> Need use 'clk' instead of 'mclk', which is the original removed local
> variable.
>
> The related original commit:
>
> "652ed95 cpufreq: introduce cpufreq_generic_get() routine"
>
> The related error with allmodconfig for unicore32:
>
> CC drivers/cpufreq/unicore2-cpufreq.o
> drivers/cpufreq/unicore2-cpufreq.c: In function 'ucv2_target':
> drivers/cpufreq/unicore2-cpufreq.c:48: error: 'struct
> cpufreq_policy' has no member named 'mclk'
> make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
> make[1]: *** [drivers/cpufreq] Error 2
> make: *** [drivers] Error 2
>
> Fixes: 652ed95d5fa6 (cpufreq: introduce cpufreq_generic_get() routine)
> Signed-off-by: Chen Gang <[email protected]>
> Acked-by: Viresh Kumar <[email protected]>
> Cc: 3.14+ <[email protected]> # 3.14+
> Signed-off-by: Rafael J. Wysocki <[email protected]>
>

--
Chen Gang

Open, share, and attitude like air, water, and life which God blessed

2014-04-08 10:55:32

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] drivers:cpufreq:unicore32: fix typo issue for 'clk'

On Tuesday, April 08, 2014 09:38:16 AM Viresh Kumar wrote:
> On 8 April 2014 06:31, Chen Gang <[email protected]> wrote:
> >> @stable: please apply this for v3.14, as it broke in that cycle..
>
> This wouldn't work..
>
> > Thank you.
>
> Can you please send it again for stable as well?

I have labeled it for -stable and it doesn't work like that. -stable won't
take any patches you send them before the commits in question are in the
Linus' tree anyway. And you need to provide the original commit hashes then.

Thanks!

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.