OPP: Remove custom OPP helper support

The only user of the custom helper is migrated to use
dev_pm_opp_set_config_regulators() interface. Remove the now unused
custom OPP helper support.

This cleans up _set_opp() and leaves a single code path to be used by
all users.

Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 3a794bf..e74bdc1 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -979,36 +979,6 @@ static int _set_opp_bw(const struct opp_table *opp_table,
        return 0;
 }
 
-static int _set_opp_custom(const struct opp_table *opp_table,
-                          struct device *dev, struct dev_pm_opp *opp,
-                          unsigned long freq)
-{
-       struct dev_pm_set_opp_data *data = opp_table->set_opp_data;
-       struct dev_pm_opp *old_opp = opp_table->current_opp;
-       int size;
-
-       /*
-        * We support this only if dev_pm_opp_set_config() was called
-        * earlier to set regulators.
-        */
-       if (opp_table->sod_supplies) {
-               size = sizeof(*old_opp->supplies) * opp_table->regulator_count;
-               memcpy(data->old_opp.supplies, old_opp->supplies, size);
-               memcpy(data->new_opp.supplies, opp->supplies, size);
-               data->regulator_count = opp_table->regulator_count;
-       } else {
-               data->regulator_count = 0;
-       }
-
-       data->regulators = opp_table->regulators;
-       data->clk = opp_table->clk;
-       data->dev = dev;
-       data->old_opp.rate = old_opp->rate;
-       data->new_opp.rate = freq;
-
-       return opp_table->set_opp(data);
-}
-
 static int _set_required_opp(struct device *dev, struct device *pd_dev,
                             struct dev_pm_opp *opp, int i)
 {
@@ -1195,13 +1165,7 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
                }
        }
 
-       if (opp_table->set_opp) {
-               ret = _set_opp_custom(opp_table, dev, opp, freq);
-       } else {
-               /* Only frequency scaling */
-               ret = _generic_set_opp_clk_only(dev, opp_table->clk, freq);
-       }
-
+       ret = _generic_set_opp_clk_only(dev, opp_table->clk, freq);
        if (ret)
                return ret;
 
@@ -2065,7 +2029,6 @@ static void _opp_put_prop_name(struct opp_table *opp_table)
 static int _opp_set_regulators(struct opp_table *opp_table, struct device *dev,
                               const char * const names[])
 {
-       struct dev_pm_opp_supply *supplies;
        const char * const *temp = names;
        struct regulator *reg;
        int count = 0, ret, i;
@@ -2101,20 +2064,6 @@ static int _opp_set_regulators(struct opp_table *opp_table, struct device *dev,
 
        opp_table->regulator_count = count;
 
-       supplies = kmalloc_array(count * 2, sizeof(*supplies), GFP_KERNEL);
-       if (!supplies) {
-               ret = -ENOMEM;
-               goto free_regulators;
-       }
-
-       mutex_lock(&opp_table->lock);
-       opp_table->sod_supplies = supplies;
-       if (opp_table->set_opp_data) {
-               opp_table->set_opp_data->old_opp.supplies = supplies;
-               opp_table->set_opp_data->new_opp.supplies = supplies + count;
-       }
-       mutex_unlock(&opp_table->lock);
-
        /* Set generic config_regulators() for single regulators here */
        if (count == 1)
                opp_table->config_regulators = _opp_config_regulator_single;
@@ -2151,16 +2100,6 @@ static void _opp_put_regulators(struct opp_table *opp_table)
        for (i = opp_table->regulator_count - 1; i >= 0; i--)
                regulator_put(opp_table->regulators[i]);
 
-       mutex_lock(&opp_table->lock);
-       if (opp_table->set_opp_data) {
-               opp_table->set_opp_data->old_opp.supplies = NULL;
-               opp_table->set_opp_data->new_opp.supplies = NULL;
-       }
-
-       kfree(opp_table->sod_supplies);
-       opp_table->sod_supplies = NULL;
-       mutex_unlock(&opp_table->lock);
-
        kfree(opp_table->regulators);
        opp_table->regulators = NULL;
        opp_table->regulator_count = -1;
@@ -2234,61 +2173,6 @@ static void _opp_put_clknames(struct opp_table *opp_table)
 }
 
 /**
- * _opp_register_set_opp_helper() - Register custom set OPP helper
- * @dev: Device for which the helper is getting registered.
- * @set_opp: Custom set OPP helper.
- *
- * This is useful to support complex platforms (like platforms with multiple
- * regulators per device), instead of the generic OPP set rate helper.
- *
- * This must be called before any OPPs are initialized for the device.
- */
-static int _opp_register_set_opp_helper(struct opp_table *opp_table,
-       struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data))
-{
-       struct dev_pm_set_opp_data *data;
-
-       /* Another CPU that shares the OPP table has set the helper ? */
-       if (opp_table->set_opp)
-               return 0;
-
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
-       if (!data)
-               return -ENOMEM;
-
-       mutex_lock(&opp_table->lock);
-       opp_table->set_opp_data = data;
-       if (opp_table->sod_supplies) {
-               data->old_opp.supplies = opp_table->sod_supplies;
-               data->new_opp.supplies = opp_table->sod_supplies +
-                                        opp_table->regulator_count;
-       }
-       mutex_unlock(&opp_table->lock);
-
-       opp_table->set_opp = set_opp;
-
-       return 0;
-}
-
-/**
- * _opp_unregister_set_opp_helper() - Releases resources blocked for set_opp helper
- * @opp_table: OPP table returned from _opp_register_set_opp_helper().
- *
- * Release resources blocked for platform specific set_opp helper.
- */
-static void _opp_unregister_set_opp_helper(struct opp_table *opp_table)
-{
-       if (opp_table->set_opp) {
-               opp_table->set_opp = NULL;
-
-               mutex_lock(&opp_table->lock);
-               kfree(opp_table->set_opp_data);
-               opp_table->set_opp_data = NULL;
-               mutex_unlock(&opp_table->lock);
-       }
-}
-
-/**
  * _opp_set_config_regulators_helper() - Register custom set regulator helper.
  * @dev: Device for which the helper is getting registered.
  * @config_regulators: Custom set regulator helper.
@@ -2446,10 +2330,8 @@ static void _opp_clear_config(struct opp_config_data *data)
                _opp_put_regulators(data->opp_table);
        if (data->flags & OPP_CONFIG_SUPPORTED_HW)
                _opp_put_supported_hw(data->opp_table);
-       if (data->flags & OPP_CONFIG_REGULATOR_HELPER) {
+       if (data->flags & OPP_CONFIG_REGULATOR_HELPER)
                _opp_put_config_regulators_helper(data->opp_table);
-               _opp_unregister_set_opp_helper(data->opp_table);
-       }
        if (data->flags & OPP_CONFIG_PROP_NAME)
                _opp_put_prop_name(data->opp_table);
        if (data->flags & OPP_CONFIG_CLK)
@@ -2520,16 +2402,6 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config)
                data->flags |= OPP_CONFIG_PROP_NAME;
        }
 
-       /* Configure opp helper */
-       if (config->set_opp) {
-               ret = _opp_register_set_opp_helper(opp_table, dev,
-                                                  config->set_opp);
-               if (ret)
-                       goto err;
-
-               data->flags |= OPP_CONFIG_REGULATOR_HELPER;
-       }
-
        /* Configure config_regulators helper */
        if (config->config_regulators) {
                ret = _opp_set_config_regulators_helper(opp_table, dev,

diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
index 45fd407..13abe99 100644 (file)
--- a/drivers/opp/opp.h
+++ b/drivers/opp/opp.h
@@ -182,9 +182,6 @@ enum opp_table_access {
  * @enabled: Set to true if the device's resources are enabled/configured.
  * @genpd_performance_state: Device's power domain support performance state.
  * @is_genpd: Marks if the OPP table belongs to a genpd.
- * @set_opp: Platform specific set_opp callback
- * @sod_supplies: Set opp data supplies
- * @set_opp_data: Data to be passed to set_opp callback
  * @dentry:    debugfs dentry pointer of the real device directory (not links).
  * @dentry_name: Name of the real dentry.
  *
@@ -234,10 +231,6 @@ struct opp_table {
        bool genpd_performance_state;
        bool is_genpd;
 
-       int (*set_opp)(struct dev_pm_set_opp_data *data);
-       struct dev_pm_opp_supply *sod_supplies;
-       struct dev_pm_set_opp_data *set_opp_data;
-
 #ifdef CONFIG_DEBUG_FS
        struct dentry *dentry;
        char dentry_name[NAME_MAX];

diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 1e2b33d..9d59aed 100644 (file)
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -57,39 +57,6 @@ struct dev_pm_opp_icc_bw {
        u32 peak;
 };
 
-/**
- * struct dev_pm_opp_info - OPP freq/voltage/current values
- * @rate:      Target clk rate in hz
- * @supplies:  Array of voltage/current values for all power supplies
- *
- * This structure stores the freq/voltage/current values for a single OPP.
- */
-struct dev_pm_opp_info {
-       unsigned long rate;
-       struct dev_pm_opp_supply *supplies;
-};
-
-/**
- * struct dev_pm_set_opp_data - Set OPP data
- * @old_opp:   Old OPP info
- * @new_opp:   New OPP info
- * @regulators:        Array of regulator pointers
- * @regulator_count: Number of regulators
- * @clk:       Pointer to clk
- * @dev:       Pointer to the struct device
- *
- * This structure contains all information required for setting an OPP.
- */
-struct dev_pm_set_opp_data {
-       struct dev_pm_opp_info old_opp;
-       struct dev_pm_opp_info new_opp;
-
-       struct regulator **regulators;
-       unsigned int regulator_count;
-       struct clk *clk;
-       struct device *dev;
-};
-
 typedef int (*config_regulators_t)(struct device *dev,
                        struct dev_pm_opp *old_opp, struct dev_pm_opp *new_opp,
                        struct regulator **regulators, unsigned int count);
@@ -98,7 +65,6 @@ typedef int (*config_regulators_t)(struct device *dev,
  * struct dev_pm_opp_config - Device OPP configuration values
  * @clk_names: Clk names, NULL terminated array, max 1 clock for now.
  * @prop_name: Name to postfix to properties.
- * @set_opp: Custom set OPP helper.
  * @config_regulators: Custom set regulator helper.
  * @supported_hw: Array of hierarchy of versions to match.
  * @supported_hw_count: Number of elements in the array.
@@ -113,7 +79,6 @@ struct dev_pm_opp_config {
        /* NULL terminated */
        const char * const *clk_names;
        const char *prop_name;
-       int (*set_opp)(struct dev_pm_set_opp_data *data);
        config_regulators_t config_regulators;
        const unsigned int *supported_hw;
        unsigned int supported_hw_count;
@@ -610,22 +575,6 @@ static inline int devm_pm_opp_set_clkname(struct device *dev, const char *name)
        return devm_pm_opp_set_config(dev, &config);
 }
 
-/* set-opp helpers */
-static inline int dev_pm_opp_register_set_opp_helper(struct device *dev,
-                       int (*set_opp)(struct dev_pm_set_opp_data *data))
-{
-       struct dev_pm_opp_config config = {
-               .set_opp = set_opp,
-       };
-
-       return dev_pm_opp_set_config(dev, &config);
-}
-
-static inline void dev_pm_opp_unregister_set_opp_helper(int token)
-{
-       dev_pm_opp_clear_config(token);
-}
-
 /* config-regulators helpers */
 static inline int dev_pm_opp_set_config_regulators(struct device *dev,
                                                   config_regulators_t helper)