Merge "msm: lpm-levels: use correct enums for level modes" (ee8ecad1) · Commits · e / devices / android_kernel_sony_msm8994

drivers/cpuidle/lpm-levels.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -472,9 +472,10 @@ static int cluster_configure(struct lpm_cluster *cluster, int idx,
		/*
		* Notify that the cluster is entering a low power mode
		*/
		if (level->mode[i] == MSM_PM_SLEEP_MODE_POWER_COLLAPSE)
		if (level->mode[i] == MSM_SPM_MODE_POWER_COLLAPSE) {
		cpu_cluster_pm_enter();
		}
		}
		if (level->notify_rpm) {
		struct cpumask nextcpu;
		uint32_t us;
		@@ -614,9 +615,10 @@ static void cluster_unprepare(struct lpm_cluster *cluster,
		BUG_ON(ret);

		if (cluster->levels[last_level].mode[i] ==
		MSM_PM_SLEEP_MODE_POWER_COLLAPSE)
		MSM_SPM_MODE_POWER_COLLAPSE) {
		cpu_cluster_pm_exit();
		}
		}
		unlock_return:
		spin_unlock(&cluster->sync_lock);
		cluster_unprepare(cluster->parent, &cluster->child_cpus,