745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/cpufreq-nforce2.c linux-3.10.0-229.el7/drivers/cpufreq/cpufreq-nforce2.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/cpufreq-nforce2.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/cpufreq-nforce2.c	2015-03-09 09:22:18.376023945 -0400
745079
@@ -270,7 +270,7 @@
745079
 	pr_debug("Old CPU frequency %d kHz, new %d kHz\n",
745079
 	       freqs.old, freqs.new);
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	/* Disable IRQs */
745079
 	/* local_irq_save(flags); */
745079
@@ -285,7 +285,7 @@
745079
 	/* Enable IRQs */
745079
 	/* local_irq_restore(flags); */
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	return 0;
745079
 }
745079
Binary files linux-3.10.0-229.el7.original/drivers/cpufreq/.cpufreq-nforce2.c.swp and linux-3.10.0-229.el7/drivers/cpufreq/.cpufreq-nforce2.c.swp differ
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/exynos5440-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/exynos5440-cpufreq.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/exynos5440-cpufreq.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/exynos5440-cpufreq.c	2015-03-09 09:22:18.377023945 -0400
745079
@@ -238,7 +238,7 @@
745079
 	freqs.old = dvfs_info->cur_frequency;
745079
 	freqs.new = freq_table[index].frequency;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	/* Set the target frequency in all C0_3_PSTATE register */
745079
 	for_each_cpu(i, policy->cpus) {
745079
@@ -279,7 +279,7 @@
745079
 		dev_crit(dvfs_info->dev, "New frequency out of range\n");
745079
 		freqs.new = dvfs_info->cur_frequency;
745079
 	}
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	cpufreq_cpu_put(policy);
745079
 	mutex_unlock(&cpufreq_lock);
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/gx-suspmod.c linux-3.10.0-229.el7/drivers/cpufreq/gx-suspmod.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/gx-suspmod.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/gx-suspmod.c	2015-03-09 09:22:18.377023945 -0400
745079
@@ -265,7 +265,7 @@
745079
 
745079
 	freqs.new = new_khz;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 	local_irq_save(flags);
745079
 
745079
 	if (new_khz != stock_freq) {
745079
@@ -314,7 +314,7 @@
745079
 
745079
 	gx_params->pci_suscfg = suscfg;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	pr_debug("suspend modulation w/ duration of ON:%d us, OFF:%d us\n",
745079
 		gx_params->on_duration * 32, gx_params->off_duration * 32);
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/integrator-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/integrator-cpufreq.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/integrator-cpufreq.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/integrator-cpufreq.c	2015-03-09 09:22:18.377023945 -0400
745079
@@ -121,7 +121,7 @@
745079
 		return 0;
745079
 	}
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	cm_osc = __raw_readl(CM_OSC);
745079
 
745079
@@ -142,7 +142,7 @@
745079
 	 */
745079
 	set_cpus_allowed(current, cpus_allowed);
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	return 0;
745079
 }
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/longhaul.c linux-3.10.0-229.el7/drivers/cpufreq/longhaul.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/longhaul.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/longhaul.c	2015-03-09 09:22:18.377023945 -0400
745079
@@ -269,7 +269,7 @@
745079
 	freqs.old = calc_speed(longhaul_get_cpu_mult());
745079
 	freqs.new = speed;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	pr_debug("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
745079
 			fsb, mult/10, mult%10, print_speed(speed/1000));
745079
@@ -386,7 +386,7 @@
745079
 		}
745079
 	}
745079
 	/* Report true CPU frequency */
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	if (!bm_timeout)
745079
 		printk(KERN_INFO PFX "Warning: Timeout while waiting for "
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k6.c linux-3.10.0-229.el7/drivers/cpufreq/powernow-k6.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k6.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/powernow-k6.c	2015-03-09 09:23:09.182024898 -0400
745079
@@ -83,7 +83,7 @@
745079
 	freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
745079
 	freqs.new = busfreq * clock_ratio[best_i].driver_data;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	/* we now need to transform best_i to the BVC format, see AMD#23446 */
745079
 
745079
@@ -98,7 +98,7 @@
745079
 	msrval = POWERNOW_IOPORT + 0x0;
745079
 	wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	return;
745079
 }
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k7.c linux-3.10.0-229.el7/drivers/cpufreq/powernow-k7.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/powernow-k7.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/powernow-k7.c	2015-03-09 09:23:52.126025704 -0400
745079
@@ -269,7 +269,7 @@
745079
 
745079
 	freqs.new = powernow_table[index].frequency;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	/* Now do the magic poking into the MSRs.  */
745079
 
745079
@@ -290,7 +290,7 @@
745079
 	if (have_a0 == 1)
745079
 		local_irq_enable();
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 }
745079
 
745079
 
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/sh-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/sh-cpufreq.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/sh-cpufreq.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/sh-cpufreq.c	2015-03-09 09:22:18.378023945 -0400
745079
@@ -68,10 +68,10 @@
745079
 	freqs.new	= (freq + 500) / 1000;
745079
 	freqs.flags	= 0;
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 	set_cpus_allowed_ptr(current, &cpus_allowed);
745079
 	clk_set_rate(cpuclk, freq);
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, 0);
745079
 
745079
 	dev_dbg(dev, "set frequency %lu Hz\n", freq);
745079
 
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-centrino.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-centrino.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-centrino.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-centrino.c	2015-03-09 09:58:30.112064688 -0400
745079
@@ -345,7 +345,6 @@
745079
 	struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu);
745079
 	unsigned freq;
745079
 	unsigned l, h;
745079
-	int ret;
745079
 	int i;
745079
 
745079
 	/* Only Intel makes Enhanced Speedstep-capable CPUs */
745079
@@ -402,15 +401,8 @@
745079
 
745079
 	pr_debug("centrino_cpu_init: cur=%dkHz\n", policy->cur);
745079
 
745079
-	ret = cpufreq_frequency_table_cpuinfo(policy,
745079
+	return cpufreq_table_validate_and_show(policy,
745079
 		per_cpu(centrino_model, policy->cpu)->op_points);
745079
-	if (ret)
745079
-		return (ret);
745079
-
745079
-	cpufreq_frequency_table_get_attr(
745079
-		per_cpu(centrino_model, policy->cpu)->op_points, policy->cpu);
745079
-
745079
-	return 0;
745079
 }
745079
 
745079
 static int centrino_cpu_exit(struct cpufreq_policy *policy)
745079
@@ -428,19 +420,6 @@
745079
 }
745079
 
745079
 /**
745079
- * centrino_verify - verifies a new CPUFreq policy
745079
- * @policy: new policy
745079
- *
745079
- * Limit must be within this model's frequency range at least one
745079
- * border included.
745079
- */
745079
-static int centrino_verify (struct cpufreq_policy *policy)
745079
-{
745079
-	return cpufreq_frequency_table_verify(policy,
745079
-			per_cpu(centrino_model, policy->cpu)->op_points);
745079
-}
745079
-
745079
-/**
745079
  * centrino_setpolicy - set a new CPUFreq policy
745079
  * @policy: new policy
745079
  * @target_freq: the target frequency
745079
@@ -561,20 +540,15 @@
745079
 	return retval;
745079
 }
745079
 
745079
-static struct freq_attr* centrino_attr[] = {
745079
-	&cpufreq_freq_attr_scaling_available_freqs,
745079
-	NULL,
745079
-};
745079
-
745079
 static struct cpufreq_driver centrino_driver = {
745079
 	.name		= "centrino", /* should be speedstep-centrino,
745079
 					 but there's a 16 char limit */
745079
 	.init		= centrino_cpu_init,
745079
 	.exit		= centrino_cpu_exit,
745079
-	.verify		= centrino_verify,
745079
+	.verify		= cpufreq_generic_frequency_table_verify,
745079
 	.target		= centrino_target,
745079
 	.get		= get_cur_freq,
745079
-	.attr           = centrino_attr,
745079
+	.attr		= cpufreq_generic_attr,
745079
 };
745079
 
745079
 /*
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-ich.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-ich.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-ich.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-ich.c	2015-03-09 09:58:30.113064688 -0400
745079
@@ -289,18 +289,6 @@
745079
 }
745079
 
745079
 
745079
-/**
745079
- * speedstep_verify - verifies a new CPUFreq policy
745079
- * @policy: new policy
745079
- *
745079
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
745079
- * at least one border included.
745079
- */
745079
-static int speedstep_verify(struct cpufreq_policy *policy)
745079
-{
745079
-	return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
745079
-}
745079
-
745079
 struct get_freqs {
745079
 	struct cpufreq_policy *policy;
745079
 	int ret;
745079
@@ -320,7 +308,6 @@
745079
 
745079
 static int speedstep_cpu_init(struct cpufreq_policy *policy)
745079
 {
745079
-	int result;
745079
 	unsigned int policy_cpu, speed;
745079
 	struct get_freqs gf;
745079
 
745079
@@ -349,36 +336,18 @@
745079
 	/* cpuinfo and default policy values */
745079
 	policy->cur = speed;
745079
 
745079
-	result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
745079
-	if (result)
745079
-		return result;
745079
-
745079
-	cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
745079
-
745079
-	return 0;
745079
+	return cpufreq_table_validate_and_show(policy, speedstep_freqs);
745079
 }
745079
 
745079
 
745079
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
745079
-{
745079
-	cpufreq_frequency_table_put_attr(policy->cpu);
745079
-	return 0;
745079
-}
745079
-
745079
-static struct freq_attr *speedstep_attr[] = {
745079
-	&cpufreq_freq_attr_scaling_available_freqs,
745079
-	NULL,
745079
-};
745079
-
745079
-
745079
 static struct cpufreq_driver speedstep_driver = {
745079
 	.name	= "speedstep-ich",
745079
-	.verify	= speedstep_verify,
745079
+	.verify	= cpufreq_generic_frequency_table_verify,
745079
 	.target	= speedstep_target,
745079
 	.init	= speedstep_cpu_init,
745079
-	.exit	= speedstep_cpu_exit,
745079
+	.exit	= cpufreq_generic_exit,
745079
 	.get	= speedstep_get,
745079
-	.attr	= speedstep_attr,
745079
+	.attr	= cpufreq_generic_attr,
745079
 };
745079
 
745079
 static const struct x86_cpu_id ss_smi_ids[] = {
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-smi.c linux-3.10.0-229.el7/drivers/cpufreq/speedstep-smi.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/speedstep-smi.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/speedstep-smi.c	2015-03-09 09:58:30.113064688 -0400
745079
@@ -264,19 +264,6 @@
745079
 }
745079
 
745079
 
745079
-/**
745079
- * speedstep_verify - verifies a new CPUFreq policy
745079
- * @policy: new policy
745079
- *
745079
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
745079
- * at least one border included.
745079
- */
745079
-static int speedstep_verify(struct cpufreq_policy *policy)
745079
-{
745079
-	return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
745079
-}
745079
-
745079
-
745079
 static int speedstep_cpu_init(struct cpufreq_policy *policy)
745079
 {
745079
 	int result;
745079
@@ -329,19 +316,7 @@
745079
 	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
745079
 	policy->cur = speed;
745079
 
745079
-	result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
745079
-	if (result)
745079
-		return result;
745079
-
745079
-	cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
745079
-
745079
-	return 0;
745079
-}
745079
-
745079
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
745079
-{
745079
-	cpufreq_frequency_table_put_attr(policy->cpu);
745079
-	return 0;
745079
+	return cpufreq_table_validate_and_show(policy, speedstep_freqs);
745079
 }
745079
 
745079
 static unsigned int speedstep_get(unsigned int cpu)
745079
@@ -362,20 +337,15 @@
745079
 	return result;
745079
 }
745079
 
745079
-static struct freq_attr *speedstep_attr[] = {
745079
-	&cpufreq_freq_attr_scaling_available_freqs,
745079
-	NULL,
745079
-};
745079
-
745079
 static struct cpufreq_driver speedstep_driver = {
745079
 	.name		= "speedstep-smi",
745079
-	.verify		= speedstep_verify,
745079
+	.verify		= cpufreq_generic_frequency_table_verify,
745079
 	.target		= speedstep_target,
745079
 	.init		= speedstep_cpu_init,
745079
-	.exit		= speedstep_cpu_exit,
745079
+	.exit		= cpufreq_generic_exit,
745079
 	.get		= speedstep_get,
745079
 	.resume		= speedstep_resume,
745079
-	.attr		= speedstep_attr,
745079
+	.attr		= cpufreq_generic_attr,
745079
 };
745079
 
745079
 static const struct x86_cpu_id ss_smi_ids[] = {
745079
diff -urN linux-3.10.0-229.el7.original/drivers/cpufreq/unicore2-cpufreq.c linux-3.10.0-229.el7/drivers/cpufreq/unicore2-cpufreq.c
745079
--- linux-3.10.0-229.el7.original/drivers/cpufreq/unicore2-cpufreq.c	2015-01-29 18:15:53.000000000 -0500
745079
+++ linux-3.10.0-229.el7/drivers/cpufreq/unicore2-cpufreq.c	2015-03-09 09:24:33.053026472 -0400
745079
@@ -50,14 +50,14 @@
745079
 	struct cpufreq_freqs freqs;
745079
 	struct clk *mclk = clk_get(NULL, "MAIN_CLK");
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
745079
+	cpufreq_freq_transition_begin(policy, &freqs);
745079
 
745079
 	if (!clk_set_rate(mclk, target_freq * 1000)) {
745079
 		freqs.old = cur;
745079
 		freqs.new = target_freq;
745079
 	}
745079
 
745079
-	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
745079
+	cpufreq_freq_transition_end(policy, &freqs, ret);
745079
 
745079
 	return 0;
745079
 }