Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bad5845 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: governor: Remove fossil comment in the cpufreq_governor_dbs()
  cpufreq: OMAP: Fix compilation error 'r & ret undeclared'
  cpufreq: conservative: set requested_freq to policy max when it is over policy max
parents 77aa2651 aae467c7

drivers/cpufreq/cpufreq_conservative.c

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static void cs_check_cpu(int cpu, unsigned int load) 


		dbs_info->requested_freq += get_freq_target(cs_tuners, policy);



		if (dbs_info->requested_freq > policy->max)

			dbs_info->requested_freq = policy->max;



		__cpufreq_driver_target(policy, dbs_info->requested_freq,

			CPUFREQ_RELATION_H);

		return;

drivers/cpufreq/cpufreq_governor.c

+0 −4
Original line number Diff line number Diff line
@@ -328,10 +328,6 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, 
					     dbs_data->cdata->gov_dbs_timer);

		}



		/*

		 * conservative does not implement micro like ondemand

		 * governor, thus we are bound to jiffes/HZ

		 */

		if (dbs_data->cdata->governor == GOV_CONSERVATIVE) {

			cs_dbs_info->down_skip = 0;

			cs_dbs_info->enable = 1;

drivers/cpufreq/omap-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static unsigned int omap_getspeed(unsigned int cpu) 


static int omap_target(struct cpufreq_policy *policy, unsigned int index)

{

	int r, ret;

	struct dev_pm_opp *opp;

	unsigned long freq, volt = 0, volt_old = 0, tol = 0;

	unsigned int old_freq, new_freq;