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

Commit 0d834459 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: cpuidle: lpm-levels: Fixes for clockevents_notify" into msm-4.8

parents 4e2671fc d8cc9c0c

drivers/cpuidle/lpm-levels.c

+0 −5
Original line number Diff line number Diff line
@@ -1053,8 +1053,6 @@ static int cluster_configure(struct lpm_cluster *cluster, int idx, 
	/* Notify cluster enter event after successfully config completion */

	cluster_notify(cluster, level, true);



	sched_set_cluster_dstate(&cluster->child_cpus, idx, 0, 0);



	cluster->last_level = idx;



	if (predicted && (idx < (cluster->nlevels - 1))) {
@@ -1213,7 +1211,6 @@ static void cluster_unprepare(struct lpm_cluster *cluster, 
		WARN_ON(ret);



	}

	sched_set_cluster_dstate(&cluster->child_cpus, 0, 0, 0);



	cluster_notify(cluster, &cluster->levels[last_level], false);
@@ -1437,8 +1434,6 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	struct power_params *pwr_params;



	pwr_params = &cluster->cpu->levels[idx].pwr;

	sched_set_cpu_cstate(smp_processor_id(), idx + 1,

		pwr_params->energy_overhead, pwr_params->latency_us);



	pwr_params = &cluster->cpu->levels[idx].pwr;