cpufreq: Remove CPUFREQ_ADJUST and CPUFREQ_NOTIFY policy notifier events

No driver makes reference to these events now, remove them and the code
related to them.

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

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index c13dcb5..e0ee238 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2360,15 +2360,13 @@ EXPORT_SYMBOL(cpufreq_get_policy);
  * @policy: Policy object to modify.
  * @new_policy: New policy data.
  *
- * Pass @new_policy to the cpufreq driver's ->verify() callback, run the
- * installed policy notifiers for it with the CPUFREQ_ADJUST value, pass it to
- * the driver's ->verify() callback again and run the notifiers for it again
- * with the CPUFREQ_NOTIFY value.  Next, copy the min and max parameters
- * of @new_policy to @policy and either invoke the driver's ->setpolicy()
- * callback (if present) or carry out a governor update for @policy.  That is,
- * run the current governor's ->limits() callback (if the governor field in
- * @new_policy points to the same object as the one in @policy) or replace the
- * governor for @policy with the new one stored in @new_policy.
+ * Pass @new_policy to the cpufreq driver's ->verify() callback. Next, copy the
+ * min and max parameters of @new_policy to @policy and either invoke the
+ * driver's ->setpolicy() callback (if present) or carry out a governor update
+ * for @policy.  That is, run the current governor's ->limits() callback (if the
+ * governor field in @new_policy points to the same object as the one in
+ * @policy) or replace the governor for @policy with the new one stored in
+ * @new_policy.
  *
  * The cpuinfo part of @policy is not updated by this function.
  */
@@ -2396,26 +2394,6 @@ int cpufreq_set_policy(struct cpufreq_policy *policy,
        if (ret)
                return ret;
 
-       /*
-        * The notifier-chain shall be removed once all the users of
-        * CPUFREQ_ADJUST are moved to use the QoS framework.
-        */
-       /* adjust if necessary - all reasons */
-       blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
-                       CPUFREQ_ADJUST, new_policy);
-
-       /*
-        * verify the cpu speed can be set within this limit, which might be
-        * different to the first one
-        */
-       ret = cpufreq_driver->verify(new_policy);
-       if (ret)
-               return ret;
-
-       /* notification of the new policy */
-       blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
-                       CPUFREQ_NOTIFY, new_policy);
-
        policy->min = new_policy->min;
        policy->max = new_policy->max;
        trace_cpu_frequency_limits(policy);

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index afc1038..c57e88e 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -456,10 +456,8 @@ static inline void cpufreq_resume(void) {}
 #define CPUFREQ_POSTCHANGE             (1)
 
 /* Policy Notifiers  */
-#define CPUFREQ_ADJUST                 (0)
-#define CPUFREQ_NOTIFY                 (1)
-#define CPUFREQ_CREATE_POLICY          (2)
-#define CPUFREQ_REMOVE_POLICY          (3)
+#define CPUFREQ_CREATE_POLICY          (0)
+#define CPUFREQ_REMOVE_POLICY          (1)
 
 #ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);