Merge back cpufreq updates for v5.11.

[sfrench/cifs-2.6.git] / include / linux / cpufreq.h

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index acbad3b363226efa0bd6dd45514cc1490edb2813..584fccd4fcabb8114f32e2f6b87c2933bbd640b5 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -65,7 +65,6 @@ struct cpufreq_policy {
        unsigned int            max;    /* in kHz */
        unsigned int            cur;    /* in kHz, only needed if cpufreq
                                         * governors are used */
-       unsigned int            restore_freq; /* = policy->cur before transition */
        unsigned int            suspend_freq; /* freq to set during suspend */
 
        unsigned int            policy; /* see above */
@@ -314,10 +313,6 @@ struct cpufreq_driver {
        /* define one out of two */
        int             (*setpolicy)(struct cpufreq_policy *policy);
 
-       /*
-        * On failure, should always restore frequency to policy->restore_freq
-        * (i.e. old freq).
-        */
        int             (*target)(struct cpufreq_policy *policy,
                                  unsigned int target_freq,
                                  unsigned int relation);       /* Deprecated */