Merge "cpufreq: Disable light-weight init/teardown during suspend/resume" (80093f30) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/cpufreq/cpufreq.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -1747,17 +1747,14 @@ void cpufreq_suspend(void)
		pr_debug("%s: Suspending Governors\n", __func__);

		list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
		if (__cpufreq_governor(policy, CPUFREQ_GOV_STOP))
		pr_err("%s: Failed to stop governor for policy: %p\n",
		__func__, policy);
		else if (cpufreq_driver->suspend
		if (cpufreq_driver->suspend
		&& cpufreq_driver->suspend(policy))
		pr_err("%s: Failed to suspend driver: %p\n", __func__,
		policy);
		}

		suspend:
		cpufreq_suspended = true;
		cpufreq_suspended = false;
		}

		/**
		@@ -1784,10 +1781,6 @@ void cpufreq_resume(void)
		if (cpufreq_driver->resume && cpufreq_driver->resume(policy))
		pr_err("%s: Failed to resume driver: %p\n", __func__,
		policy);
		else if (__cpufreq_governor(policy, CPUFREQ_GOV_START)
		\|\| __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS))
		pr_err("%s: Failed to start governor for policy: %p\n",
		__func__, policy);
		}

		/*