OPP: Migrate attach-genpd API to use set-config helpers

Now that we have a central API to handle all OPP table configurations,
migrate the attach-genpd family of helpers to use the new
infrastructure.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 9da7dcf62cabf878a79cd416e9e2b4ac51ce9137..458584994c2b6fff62338422bb6fe6319da09858 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -2285,7 +2285,7 @@ static void _opp_unregister_set_opp_helper(struct opp_table *opp_table)
        }
 }
 
-static void _opp_detach_genpd(struct opp_table *opp_table)
+static void _detach_genpd(struct opp_table *opp_table)
 {
        int index;
 
@@ -2305,7 +2305,7 @@ static void _opp_detach_genpd(struct opp_table *opp_table)
 }
 
 /**
- * dev_pm_opp_attach_genpd - Attach genpd(s) for the device and save virtual device pointer
+ * _opp_attach_genpd - Attach genpd(s) for the device and save virtual device pointer
  * @dev: Consumer device for which the genpd is getting attached.
  * @names: Null terminated array of pointers containing names of genpd to attach.
  * @virt_devs: Pointer to return the array of virtual devices.
@@ -2326,30 +2326,23 @@ static void _opp_detach_genpd(struct opp_table *opp_table)
  * The order of entries in the names array must match the order in which
  * "required-opps" are added in DT.
  */
-struct opp_table *dev_pm_opp_attach_genpd(struct device *dev,
-               const char * const *names, struct device ***virt_devs)
+static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
+                       const char * const *names, struct device ***virt_devs)
 {
-       struct opp_table *opp_table;
        struct device *virt_dev;
        int index = 0, ret = -EINVAL;
        const char * const *name = names;
 
-       opp_table = _add_opp_table(dev, false);
-       if (IS_ERR(opp_table))
-               return opp_table;
-
        if (opp_table->genpd_virt_devs)
-               return opp_table;
+               return 0;
 
        /*
         * If the genpd's OPP table isn't already initialized, parsing of the
         * required-opps fail for dev. We should retry this after genpd's OPP
         * table is added.
         */
-       if (!opp_table->required_opp_count) {
-               ret = -EPROBE_DEFER;
-               goto put_table;
-       }
+       if (!opp_table->required_opp_count)
+               return -EPROBE_DEFER;
 
        mutex_lock(&opp_table->genpd_virt_dev_lock);
 
@@ -2382,78 +2375,38 @@ struct opp_table *dev_pm_opp_attach_genpd(struct device *dev,
                *virt_devs = opp_table->genpd_virt_devs;
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
 
-       return opp_table;
+       return 0;
 
 err:
-       _opp_detach_genpd(opp_table);
+       _detach_genpd(opp_table);
 unlock:
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
+       return ret;
 
-put_table:
-       dev_pm_opp_put_opp_table(opp_table);
-
-       return ERR_PTR(ret);
 }
-EXPORT_SYMBOL_GPL(dev_pm_opp_attach_genpd);
 
 /**
- * dev_pm_opp_detach_genpd() - Detach genpd(s) from the device.
- * @opp_table: OPP table returned by dev_pm_opp_attach_genpd().
+ * _opp_detach_genpd() - Detach genpd(s) from the device.
+ * @opp_table: OPP table returned by _opp_attach_genpd().
  *
  * This detaches the genpd(s), resets the virtual device pointers, and puts the
  * OPP table.
  */
-void dev_pm_opp_detach_genpd(struct opp_table *opp_table)
+static void _opp_detach_genpd(struct opp_table *opp_table)
 {
-       if (unlikely(!opp_table))
-               return;
-
        /*
         * Acquire genpd_virt_dev_lock to make sure virt_dev isn't getting
         * used in parallel.
         */
        mutex_lock(&opp_table->genpd_virt_dev_lock);
-       _opp_detach_genpd(opp_table);
+       _detach_genpd(opp_table);
        mutex_unlock(&opp_table->genpd_virt_dev_lock);
-
-       dev_pm_opp_put_opp_table(opp_table);
 }
-EXPORT_SYMBOL_GPL(dev_pm_opp_detach_genpd);
-
-static void devm_pm_opp_detach_genpd(void *data)
-{
-       dev_pm_opp_detach_genpd(data);
-}
-
-/**
- * devm_pm_opp_attach_genpd - Attach genpd(s) for the device and save virtual
- *                           device pointer
- * @dev: Consumer device for which the genpd is getting attached.
- * @names: Null terminated array of pointers containing names of genpd to attach.
- * @virt_devs: Pointer to return the array of virtual devices.
- *
- * This is a resource-managed version of dev_pm_opp_attach_genpd().
- *
- * Return: 0 on success and errorno otherwise.
- */
-int devm_pm_opp_attach_genpd(struct device *dev, const char * const *names,
-                            struct device ***virt_devs)
-{
-       struct opp_table *opp_table;
-
-       opp_table = dev_pm_opp_attach_genpd(dev, names, virt_devs);
-       if (IS_ERR(opp_table))
-               return PTR_ERR(opp_table);
-
-       return devm_add_action_or_reset(dev, devm_pm_opp_detach_genpd,
-                                       opp_table);
-}
-EXPORT_SYMBOL_GPL(devm_pm_opp_attach_genpd);
 
 static void _opp_clear_config(struct opp_config_data *data)
 {
        if (data->flags & OPP_CONFIG_GENPD)
-               dev_pm_opp_detach_genpd(data->opp_table);
+               _opp_detach_genpd(data->opp_table);
        if (data->flags & OPP_CONFIG_REGULATOR)
                _opp_put_regulators(data->opp_table);
        if (data->flags & OPP_CONFIG_SUPPORTED_HW)
@@ -2564,12 +2517,10 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config)
 
        /* Attach genpds */
        if (config->genpd_names) {
-               err = dev_pm_opp_attach_genpd(dev, config->genpd_names,
-                                             config->virt_devs);
-               if (IS_ERR(err)) {
-                       ret = PTR_ERR(err);
+               ret = _opp_attach_genpd(opp_table, dev, config->genpd_names,
+                                       config->virt_devs);
+               if (ret)
                        goto err;
-               }
 
                data->flags |= OPP_CONFIG_GENPD;
        }

diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 85a4b7353979f43d5a11a636325409d63907c974..20e1e5060a8a1d07579b3b332f749969d5b5367d 100644 (file)
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -186,9 +186,6 @@ void dev_pm_opp_clear_config(int token);
 
 struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, const char *name);
 void dev_pm_opp_put_prop_name(struct opp_table *opp_table);
-struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs);
-void dev_pm_opp_detach_genpd(struct opp_table *opp_table);
-int devm_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs);
 struct dev_pm_opp *dev_pm_opp_xlate_required_opp(struct opp_table *src_table, struct opp_table *dst_table, struct dev_pm_opp *src_opp);
 int dev_pm_opp_xlate_performance_state(struct opp_table *src_table, struct opp_table *dst_table, unsigned int pstate);
 int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq);
@@ -367,20 +364,6 @@ static inline struct opp_table *dev_pm_opp_set_prop_name(struct device *dev, con
 
 static inline void dev_pm_opp_put_prop_name(struct opp_table *opp_table) {}
 
-static inline struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char * const *names, struct device ***virt_devs)
-{
-       return ERR_PTR(-EOPNOTSUPP);
-}
-
-static inline void dev_pm_opp_detach_genpd(struct opp_table *opp_table) {}
-
-static inline int devm_pm_opp_attach_genpd(struct device *dev,
-                                          const char * const *names,
-                                          struct device ***virt_devs)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config)
 {
        return -EOPNOTSUPP;
@@ -639,4 +622,35 @@ static inline void dev_pm_opp_unregister_set_opp_helper(int token)
        dev_pm_opp_clear_config(token);
 }
 
+/* genpd helpers */
+static inline int dev_pm_opp_attach_genpd(struct device *dev,
+                                         const char * const *names,
+                                         struct device ***virt_devs)
+{
+       struct dev_pm_opp_config config = {
+               .genpd_names = names,
+               .virt_devs = virt_devs,
+       };
+
+       return dev_pm_opp_set_config(dev, &config);
+}
+
+static inline void dev_pm_opp_detach_genpd(int token)
+{
+       dev_pm_opp_clear_config(token);
+}
+
+static inline int devm_pm_opp_attach_genpd(struct device *dev,
+                                          const char * const *names,
+                                          struct device ***virt_devs)
+{
+       struct dev_pm_opp_config config = {
+               .genpd_names = names,
+               .virt_devs = virt_devs,
+       };
+
+       return devm_pm_opp_set_config(dev, &config);
+}
+
+
 #endif         /* __LINUX_OPP_H__ */