cpufreq: build fixes
Subsystems (2)
v2 cover cpufreq: build fixes
This is an unmodified re-send of two patches I originally submitted on January 28. Both patches were Acked by Viresh, while a third patch got replaced with a better fix. Please merge these through the cpufreq tree for 3.20 and backports.
Arnd
PATCH v2 1/2 cpufreq: s3c: remove incorrect __init annotations
The two functions s3c2416_cpufreq_driver_init and s3c_cpufreq_register are marked init but are called from a context that might be run after the __init sections are discarded, as the compiler points out:
WARNING: vmlinux.o(.data+0x1ad9dc): Section mismatch in reference from the variable s3c2416_cpufreq_driver to the function .init.text:s3c2416_cpufreq_driver_init()
WARNING: drivers/built-in.o(.text+0x35b5dc): Section mismatch in reference from the function s3c2410a_cpufreq_add() to the function .init.text:s3c_cpufreq_register()
This removes the __init markings.
drivers/cpufreq/s3c2416-cpufreq.c +2 -2
@@ -263,7 +263,7 @@ out: }#ifdef CONFIG_ARM_S3C2416_CPUFREQ_VCORESCALE -static void __init s3c2416_cpufreq_cfg_regulator (struct s3c2416_data *s3c_freq) +static void s3c2416_cpufreq_cfg_regulator (struct s3c2416_data *s3c_freq) {int count, v, i, found;struct cpufreq_frequency_table *pos;
@@ -333,7 +333,7 @@ static struct notifier_block s3c2416_cpufreq_reboot_notifier = { .notifier_call = s3c2416_cpufreq_reboot_notifier_evt, }; -static int __init s3c2416_cpufreq_driver_init (struct cpufreq_policy *policy) +static int s3c2416_cpufreq_driver_init (struct cpufreq_policy *policy) {struct s3c2416_data *s3c_freq = &s3c2416_cpufreq;struct cpufreq_frequency_table *pos;
drivers/cpufreq/s3c24xx-cpufreq.c +1 -1
@@ -454,7 +454,7 @@ static struct cpufreq_driver s3c24xx_driver = { }; -int __init s3c_cpufreq_register (struct s3c_cpufreq_info *info) +int s3c_cpufreq_register (struct s3c_cpufreq_info *info) {if (!info || !info->name) { printk(KERN_ERR "%s: failed to pass valid information\n",
PATCH v2 2/2 cpufreq: s3c: remove last use of resume_clocks callback
In reply to Arnd BergmannCommit 32726d2d550 ("ARM: SAMSUNG: Remove legacy clock code") already removed the callback pointer, but there was one remaining user:
drivers/cpufreq/s3c24xx-cpufreq.c: In function 's3c_cpufreq_resume_clocks':drivers/cpufreq/s3c24xx-cpufreq.c:149:14: error: 'struct s3c_cpufreq_info' has no member named 'resume_clocks'
cpu_cur.info->resume_clocks();
^drivers/cpufreq/s3c24xx-cpufreq.c +0 -8
@@ -144,11 +144,6 @@ static void s3c_cpufreq_setfvco(struct s3c_cpufreq_config *cfg) (cfg->info->set_fvco)(cfg); } -static inline void s3c_cpufreq_resume_clocks (void ) -{ - cpu_cur.info->resume_clocks (); -} -static inline void s3c_cpufreq_updateclk (struct clk *clk,unsigned int freq) {
@@ -417,9 +412,6 @@ static int s3c_cpufreq_resume(struct cpufreq_policy *policy) last_target = ~0 ;/* invalidate last_target setting */ -/* first, find out what speed we resumed at. */ -s3c_cpufreq_resume_clocks (); -/* whilst we will be called later on, we try and re-set the * cpu frequencies as soon as possible so that we do not end * up resuming devices and then immediately having to re-set
v2 cover cpufreq: build fixes
In reply to Arnd BergmannQuoted 4 lines · Arnd Bergmann
This is an unmodified re-send of two patches I originally submitted on January 28. Both patches were Acked by Viresh, while a third patch got replaced with a better fix. Please merge these through the cpufreq tree for 3.20 and backports.
OK
It would be useful to know what series of "stable" you want them in, but I can say "all applicable" too.
Rafael
v2 cover cpufreq: build fixes
Quoted 10 lines · Rafael J. Wysocki
Quoted 4 lines · Arnd Bergmann
This is an unmodified re-send of two patches I originally submitted on January 28. Both patches were Acked by Viresh, while a third patch got replaced with a better fix. Please merge these through the cpufreq tree for 3.20 and backports.
OK
It would be useful to know what series of "stable" you want them in, but I can say "all applicable" too.
OK, the second one has that information, so never mind.
Rafael