cpufreq: Drop restore_freq from struct cpufreq_policy

The restore_freq field in struct cpufreq_policy is only used by
__target_index() in one place and a local variable in that function
may as well be used instead of it, so drop it and modify
__target_index() accordingly.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 336b5e94cbc83cf55a021fce886c5f1f678b9944..f2d96175f62d6fbe14688f3355bbe0787048dafa 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2123,7 +2123,7 @@ static int __target_intermediate(struct cpufreq_policy *policy,
 static int __target_index(struct cpufreq_policy *policy, int index)
 {
        struct cpufreq_freqs freqs = {.old = policy->cur, .flags = 0};
-       unsigned int intermediate_freq = 0;
+       unsigned int restore_freq, intermediate_freq = 0;
        unsigned int newfreq = policy->freq_table[index].frequency;
        int retval = -EINVAL;
        bool notify;
@@ -2131,6 +2131,9 @@ static int __target_index(struct cpufreq_policy *policy, int index)
        if (newfreq == policy->cur)
                return 0;
 
+       /* Save last value to restore later on errors */
+       restore_freq = policy->cur;
+
        notify = !(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION);
        if (notify) {
                /* Handle switching to intermediate frequency */
@@ -2168,7 +2171,7 @@ static int __target_index(struct cpufreq_policy *policy, int index)
                 */
                if (unlikely(retval && intermediate_freq)) {
                        freqs.old = intermediate_freq;
-                       freqs.new = policy->restore_freq;
+                       freqs.new = restore_freq;
                        cpufreq_freq_transition_begin(policy, &freqs);
                        cpufreq_freq_transition_end(policy, &freqs, 0);
                }
@@ -2203,9 +2206,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
            !(cpufreq_driver->flags & CPUFREQ_NEED_UPDATE_LIMITS))
                return 0;
 
-       /* Save last value to restore later on errors */
-       policy->restore_freq = policy->cur;
-
        if (cpufreq_driver->target)
                return cpufreq_driver->target(policy, target_freq, relation);
 

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 1eaa04f1bae634fe92485117aa4e596c011437c7..9779a6cd8baa49b06d3f5760f37a17dc647a00b4 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 */
@@ -308,10 +307,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 */