drivers:cpufreq:unicore32: fix typo issue for 'clk'

PATCH In review Chen Gang 4 participants 9 messages Apr 7, 2014 – Apr 8, 2014

Subsystems (2)

Stable branch CPU frequency scaling framework

lore

Share & tools

lore

Chen Gang

author

2014-04-07 12:04 UTC #0 lore raw

PATCH 1/1 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(-)

drivers/cpufreq/unicore2-cpufreq.c +1 -1

index 13be802..8d045af 100644
@@ -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;

Signature · 1 line

1.7.9.5

Viresh Kumar

maintainer Acked-by on v1 1/1

2014-04-07 12:08 UTC #1 lore raw

Quoted 17 lines · Chen Gang

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

Quoted 4 lines

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..

Chen Gang

author

2014-04-08 01:01 UTC #2 lore raw

Quoted 18 lines · Viresh Kumar

Quoted 17 lines · Chen Gang
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

Quoted 7 lines

Quoted 4 lines
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.

Quoted 4 lines

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

Thank you.

Thanks.

Signature · 3 lines

Chen Gang

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

Viresh Kumar

maintainer

2014-04-08 04:08 UTC #3 lore raw

Quoted 1 line · Chen Gang

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

This wouldn't work..

Quoted 1 line

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

Chen Gang

author

2014-04-08 04:39 UTC #4 lore raw

Quoted 12 lines · Viresh Kumar

Quoted 1 line · Chen Gang
Quoted 1 line
@stable: please apply this for v3.14, as it broke in that cycle..
This wouldn't work..
Quoted 1 line
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.

Signature · 3 lines

Chen Gang

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

Viresh Kumar

maintainer Acked-by

2014-04-08 05:29 UTC #5 lore raw

Quoted 1 line · Chen Gang

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]>

Chen Gang

author

2014-04-08 06:51 UTC #6 lore raw

Quoted 7 lines · Viresh Kumar

Quoted 1 line · Chen Gang
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!!

:-)

Quoted 30 lines

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]>

Signature · 3 lines

Chen Gang

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

Rafael J. Wysocki

2014-04-08 10:55 UTC #7 lore raw

In reply to Viresh Kumar

Quoted 8 lines · Viresh Kumar

Quoted 1 line · Chen Gang
Quoted 1 line
@stable: please apply this for v3.14, as it broke in that cycle..
This wouldn't work..
Quoted 1 line
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!

Signature · 2 lines

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

管雪涛

Acked-by Xuetao Guan on v1 1/1

2014-04-08 03:04 UTC #8 lore raw

In reply to Chen Gang

Thanks,

Acked-by Xuetao Guan <[email protected]>

Quoted 37 lines · ----- Chen Gang

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(-)
drivers/cpufreq/unicore2-cpufreq.c +1 -1
index 13be802..8d045af 100644
@@ -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;
Signature · 1 line
1.7.9.5