From: Ziggy <ziggy@ziggy471.com>
Date: Sat, 19 Jan 2013 21:06:01 +0000 (-0500)
Subject: Remove the last of the MP_DECISION_PATCH
X-Git-Url: https://projects.ziggy471.com/git/gitweb.cgi?p=ziggy471-sgs3-jb.git;a=commitdiff;h=bebd76867acad3f4dbc67bb6fffcd3be5a4b2499

Remove the last of the MP_DECISION_PATCH

Signed-off-by: Ziggy <ziggy@ziggy471.com>
---

--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -133,9 +133,7 @@ static struct dbs_tuners {
 	unsigned int sampling_down_factor;
 	int          powersave_bias;
 	unsigned int io_is_busy;
-#if defined(__MP_DECISION_PATCH__)
 	unsigned int cpu_utilization;
-#endif
 	/* msm8960 tuners */
 	unsigned int freq_step;
 } dbs_tuners_ins = {
@@ -144,9 +142,7 @@ static struct dbs_tuners {
 	.down_differential = DEF_FREQUENCY_DOWN_DIFFERENTIAL,
 	.ignore_nice = 0,
 	.powersave_bias = 0,
-#if defined(__MP_DECISION_PATCH__)
 	.cpu_utilization = 0,
-#endif
 	.freq_step = DEF_FREQ_STEP,
 };
 
@@ -631,12 +627,10 @@ static void dbs_freq_increase(struct cpu
 static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
 {
 	unsigned int max_load_freq;
-#if defined(__MP_DECISION_PATCH__)
 	/* Extrapolated load of this CPU */
 	unsigned int load_at_max_freq = 0;
 	/* Current load across   this CPU */
 	unsigned int cur_load = 0;
-#endif
 
 	struct cpufreq_policy *policy;
 	unsigned int j;
@@ -663,11 +657,7 @@ static void dbs_check_cpu(struct cpu_dbs
 		struct cpu_dbs_info_s *j_dbs_info;
 		cputime64_t cur_wall_time, cur_idle_time, cur_iowait_time;
 		unsigned int idle_time, wall_time, iowait_time;
-#if defined(__MP_DECISION_PATCH__)
 		unsigned int load_freq;
-#else
-		unsigned int load, load_freq;
-#endif
 		int freq_avg;
 
 		j_dbs_info = &per_cpu(od_cpu_dbs_info, j);
@@ -717,32 +707,22 @@ static void dbs_check_cpu(struct cpu_dbs
 		if (unlikely(!wall_time || wall_time < idle_time))
 			continue;
 
-#if defined(__MP_DECISION_PATCH__)
 		cur_load = 100 * (wall_time - idle_time) / wall_time;
-#else
-		load = 100 * (wall_time - idle_time) / wall_time;
-#endif
 
 		freq_avg = __cpufreq_driver_getavg(policy, j);
 		if (freq_avg <= 0)
 			freq_avg = policy->cur;
 
-#if defined(__MP_DECISION_PATCH__)
 		load_freq = cur_load * freq_avg;
-#else
-		load_freq = load * freq_avg;
-#endif
 		if (load_freq > max_load_freq)
 			max_load_freq = load_freq;
 	}
-#if defined(__MP_DECISION_PATCH__)
 	/* calculate the scaled load across CPU */
 	load_at_max_freq = (cur_load * policy->cur)/policy->cpuinfo.max_freq;
 
 	/* add cpu_utilization */
 	dbs_tuners_ins.cpu_utilization = load_at_max_freq;
 	cpufreq_notify_utilization(policy, dbs_tuners_ins.cpu_utilization);
-#endif
 
 	/* Check for frequency increase *//*increasing by freq_step*/
 	if (max_load_freq > dbs_tuners_ins.up_threshold * policy->cur) {