Commit 221dee28 authored by Linus Torvalds's avatar Linus Torvalds

Revert "[CPUFREQ] constify cpufreq_driver where possible."

This reverts commit aeeddc14, which was
half-baked and broken.  It just resulted in compile errors, since
cpufreq_register_driver() still changes the 'driver_data' by setting
bits in the flags field.  So claiming it is 'const' _really_ doesn't
work.
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f8c480f
......@@ -373,7 +373,7 @@ static int nforce2_cpu_exit(struct cpufreq_policy *policy)
return 0;
}
static const struct cpufreq_driver nforce2_driver = {
static struct cpufreq_driver nforce2_driver = {
.name = "nforce2",
.verify = nforce2_verify,
.target = nforce2_target,
......
......@@ -293,7 +293,7 @@ static struct freq_attr* eps_attr[] = {
NULL,
};
static const struct cpufreq_driver eps_driver = {
static struct cpufreq_driver eps_driver = {
.verify = eps_verify,
.target = eps_target,
.init = eps_cpu_init,
......
......@@ -267,7 +267,7 @@ static struct freq_attr* elanfreq_attr[] = {
};
static const struct cpufreq_driver elanfreq_driver = {
static struct cpufreq_driver elanfreq_driver = {
.get = elanfreq_get_cpu_frequency,
.verify = elanfreq_verify,
.target = elanfreq_target,
......
......@@ -433,7 +433,7 @@ static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)
* cpufreq_gx_init:
* MediaGX/Geode GX initialize cpufreq driver
*/
static const struct cpufreq_driver gx_suspmod_driver = {
static struct cpufreq_driver gx_suspmod_driver = {
.get = gx_get_cpuspeed,
.verify = cpufreq_gx_verify,
.target = cpufreq_gx_target,
......
......@@ -821,7 +821,7 @@ static struct freq_attr* longhaul_attr[] = {
NULL,
};
static const struct cpufreq_driver longhaul_driver = {
static struct cpufreq_driver longhaul_driver = {
.verify = longhaul_verify,
.target = longhaul_target,
.get = longhaul_get,
......
......@@ -18,7 +18,7 @@
#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longrun", msg)
static const struct cpufreq_driver longrun_driver;
static struct cpufreq_driver longrun_driver;
/**
* longrun_{low,high}_freq is needed for the conversion of cpufreq kHz
......@@ -280,7 +280,7 @@ static int __init longrun_cpu_init(struct cpufreq_policy *policy)
}
static const struct cpufreq_driver longrun_driver = {
static struct cpufreq_driver longrun_driver = {
.flags = CPUFREQ_CONST_LOOPS,
.verify = longrun_verify_policy,
.setpolicy = longrun_set_policy,
......
......@@ -195,7 +195,7 @@ static struct freq_attr* powernow_k6_attr[] = {
NULL,
};
static const struct cpufreq_driver powernow_k6_driver = {
static struct cpufreq_driver powernow_k6_driver = {
.verify = powernow_k6_verify,
.target = powernow_k6_target,
.init = powernow_k6_cpu_init,
......
......@@ -647,7 +647,7 @@ static struct freq_attr* powernow_table_attr[] = {
NULL,
};
static const struct cpufreq_driver powernow_driver = {
static struct cpufreq_driver powernow_driver = {
.verify = powernow_verify,
.target = powernow_target,
.get = powernow_get,
......
......@@ -1305,7 +1305,7 @@ static struct freq_attr* powernow_k8_attr[] = {
NULL,
};
static const struct cpufreq_driver cpufreq_amd64_driver = {
static struct cpufreq_driver cpufreq_amd64_driver = {
.verify = powernowk8_verify,
.target = powernowk8_target,
.init = powernowk8_cpu_init,
......
......@@ -138,7 +138,7 @@ static struct freq_attr* sc520_freq_attr[] = {
};
static const struct cpufreq_driver sc520_freq_driver = {
static struct cpufreq_driver sc520_freq_driver = {
.get = sc520_freq_get_cpu_frequency,
.verify = sc520_freq_verify,
.target = sc520_freq_target,
......
......@@ -374,7 +374,7 @@ static struct freq_attr* speedstep_attr[] = {
};
static const struct cpufreq_driver speedstep_driver = {
static struct cpufreq_driver speedstep_driver = {
.name = "speedstep-ich",
.verify = speedstep_verify,
.target = speedstep_target,
......
......@@ -332,7 +332,7 @@ static struct freq_attr* speedstep_attr[] = {
NULL,
};
static const struct cpufreq_driver speedstep_driver = {
static struct cpufreq_driver speedstep_driver = {
.name = "speedstep-smi",
.verify = speedstep_verify,
.target = speedstep_target,
......
......@@ -1752,7 +1752,7 @@ static struct notifier_block __cpuinitdata cpufreq_cpu_notifier =
* (and isn't unregistered in the meantime).
*
*/
int cpufreq_register_driver(const struct cpufreq_driver *driver_data)
int cpufreq_register_driver(struct cpufreq_driver *driver_data)
{
unsigned long flags;
int ret;
......@@ -1817,7 +1817,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_driver);
* Returns zero if successful, and -EINVAL if the cpufreq_driver is
* currently not initialised.
*/
int cpufreq_unregister_driver(const struct cpufreq_driver *driver)
int cpufreq_unregister_driver(struct cpufreq_driver *driver)
{
unsigned long flags;
......
......@@ -225,8 +225,8 @@ struct cpufreq_driver {
#define CPUFREQ_PM_NO_WARN 0x04 /* don't warn on suspend/resume speed
* mismatches */
int cpufreq_register_driver(const struct cpufreq_driver *driver_data);
int cpufreq_unregister_driver(const struct cpufreq_driver *driver_data);
int cpufreq_register_driver(struct cpufreq_driver *driver_data);
int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment