diff options
Diffstat (limited to 'drivers/cpufreq/cpufreq-nforce2.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq-nforce2.c | 11 | 
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c index b83d45f6857..a2258090b58 100644 --- a/drivers/cpufreq/cpufreq-nforce2.c +++ b/drivers/cpufreq/cpufreq-nforce2.c @@ -270,7 +270,7 @@ static int nforce2_target(struct cpufreq_policy *policy,  	pr_debug("Old CPU frequency %d kHz, new %d kHz\n",  	       freqs.old, freqs.new); -	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); +	cpufreq_freq_transition_begin(policy, &freqs);  	/* Disable IRQs */  	/* local_irq_save(flags); */ @@ -285,7 +285,7 @@ static int nforce2_target(struct cpufreq_policy *policy,  	/* Enable IRQs */  	/* local_irq_restore(flags); */ -	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); +	cpufreq_freq_transition_end(policy, &freqs, 0);  	return 0;  } @@ -303,9 +303,7 @@ static int nforce2_verify(struct cpufreq_policy *policy)  	if (policy->min < (fsb_pol_max * fid * 100))  		policy->max = (fsb_pol_max + 1) * fid * 100; -	cpufreq_verify_within_limits(policy, -				     policy->cpuinfo.min_freq, -				     policy->cpuinfo.max_freq); +	cpufreq_verify_within_cpu_limits(policy);  	return 0;  } @@ -362,7 +360,6 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)  	policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100;  	policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100;  	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; -	policy->cur = nforce2_get(policy->cpu);  	return 0;  } @@ -382,7 +379,7 @@ static struct cpufreq_driver nforce2_driver = {  };  #ifdef MODULE -static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = { +static const struct pci_device_id nforce2_ids[] = {  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2 },  	{}  };  | 
