From: Viresh Kumar <viresh.kumar@linaro.org>
To: Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 26/30] OPP: Remove dev_pm_opp_set_supported_hw() and friends
Date: Fri, 1 Jul 2022 13:50:21 +0530 [thread overview]
Message-ID: <a653b598ad68f40499750f2d86b266eeac27bd4a.1656660185.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1656660185.git.viresh.kumar@linaro.org>
Now that everyone has migrated to dev_pm_opp_set_config(), remove the
public interface for dev_pm_opp_set_supported_hw() and friends.
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/opp/core.c | 87 ++++++++++--------------------------------
include/linux/pm_opp.h | 19 ---------
2 files changed, 20 insertions(+), 86 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index fc3cd87ee7df..66ffe501a7c8 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1952,7 +1952,7 @@ int _opp_add_v1(struct opp_table *opp_table, struct device *dev,
}
/**
- * dev_pm_opp_set_supported_hw() - Set supported platforms
+ * _opp_set_supported_hw() - Set supported platforms
* @dev: Device for which supported-hw has to be set.
* @versions: Array of hierarchy of versions to match.
* @count: Number of elements in the array.
@@ -1962,84 +1962,39 @@ int _opp_add_v1(struct opp_table *opp_table, struct device *dev,
* OPPs, which are available for those versions, based on its 'opp-supported-hw'
* property.
*/
-struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev,
- const u32 *versions, unsigned int count)
+static int _opp_set_supported_hw(struct opp_table *opp_table,
+ const u32 *versions, unsigned int count)
{
- struct opp_table *opp_table;
-
- opp_table = _add_opp_table(dev, false);
- if (IS_ERR(opp_table))
- return opp_table;
-
- /* Make sure there are no concurrent readers while updating opp_table */
- WARN_ON(!list_empty(&opp_table->opp_list));
-
/* Another CPU that shares the OPP table has set the property ? */
if (opp_table->supported_hw)
- return opp_table;
+ return 0;
opp_table->supported_hw = kmemdup(versions, count * sizeof(*versions),
GFP_KERNEL);
- if (!opp_table->supported_hw) {
- dev_pm_opp_put_opp_table(opp_table);
- return ERR_PTR(-ENOMEM);
- }
+ if (!opp_table->supported_hw)
+ return -ENOMEM;
opp_table->supported_hw_count = count;
- return opp_table;
+ return 0;
}
-EXPORT_SYMBOL_GPL(dev_pm_opp_set_supported_hw);
/**
- * dev_pm_opp_put_supported_hw() - Releases resources blocked for supported hw
- * @opp_table: OPP table returned by dev_pm_opp_set_supported_hw().
+ * _opp_put_supported_hw() - Releases resources blocked for supported hw
+ * @opp_table: OPP table returned by _opp_set_supported_hw().
*
* This is required only for the V2 bindings, and is called for a matching
- * dev_pm_opp_set_supported_hw(). Until this is called, the opp_table structure
+ * _opp_set_supported_hw(). Until this is called, the opp_table structure
* will not be freed.
*/
-void dev_pm_opp_put_supported_hw(struct opp_table *opp_table)
+static void _opp_put_supported_hw(struct opp_table *opp_table)
{
- if (unlikely(!opp_table))
- return;
-
- kfree(opp_table->supported_hw);
- opp_table->supported_hw = NULL;
- opp_table->supported_hw_count = 0;
-
- dev_pm_opp_put_opp_table(opp_table);
-}
-EXPORT_SYMBOL_GPL(dev_pm_opp_put_supported_hw);
-
-static void devm_pm_opp_supported_hw_release(void *data)
-{
- dev_pm_opp_put_supported_hw(data);
-}
-
-/**
- * devm_pm_opp_set_supported_hw() - Set supported platforms
- * @dev: Device for which supported-hw has to be set.
- * @versions: Array of hierarchy of versions to match.
- * @count: Number of elements in the array.
- *
- * This is a resource-managed variant of dev_pm_opp_set_supported_hw().
- *
- * Return: 0 on success and errorno otherwise.
- */
-int devm_pm_opp_set_supported_hw(struct device *dev, const u32 *versions,
- unsigned int count)
-{
- struct opp_table *opp_table;
-
- opp_table = dev_pm_opp_set_supported_hw(dev, versions, count);
- if (IS_ERR(opp_table))
- return PTR_ERR(opp_table);
-
- return devm_add_action_or_reset(dev, devm_pm_opp_supported_hw_release,
- opp_table);
+ if (opp_table->supported_hw) {
+ kfree(opp_table->supported_hw);
+ opp_table->supported_hw = NULL;
+ opp_table->supported_hw_count = 0;
+ }
}
-EXPORT_SYMBOL_GPL(devm_pm_opp_set_supported_hw);
/**
* dev_pm_opp_set_prop_name() - Set prop-extn name
@@ -2575,7 +2530,7 @@ static void _opp_clear_config(struct opp_config_data *data)
if (data->flags & OPP_CONFIG_REGULATOR)
_opp_put_regulators(data->opp_table);
if (data->flags & OPP_CONFIG_SUPPORTED_HW)
- dev_pm_opp_put_supported_hw(data->opp_table);
+ _opp_put_supported_hw(data->opp_table);
if (data->flags & OPP_CONFIG_REGULATOR_HELPER)
dev_pm_opp_unregister_set_opp_helper(data->opp_table);
if (data->flags & OPP_CONFIG_PROP_NAME)
@@ -2671,12 +2626,10 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config)
/* Configure supported hardware */
if (config->supported_hw) {
- err = dev_pm_opp_set_supported_hw(dev, config->supported_hw,
- config->supported_hw_count);
- if (IS_ERR(err)) {
- ret = PTR_ERR(err);
+ ret = _opp_set_supported_hw(opp_table, config->supported_hw,
+ config->supported_hw_count);
+ if (ret)
goto err;
- }
data->flags |= OPP_CONFIG_SUPPORTED_HW;
}
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
index 0dc45d4403ce..dfbb07b871a8 100644
--- a/include/linux/pm_opp.h
+++ b/include/linux/pm_opp.h
@@ -187,9 +187,6 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config);
int devm_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config);
void dev_pm_opp_clear_config(int token);
-struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, unsigned int count);
-void dev_pm_opp_put_supported_hw(struct opp_table *opp_table);
-int devm_pm_opp_set_supported_hw(struct device *dev, const u32 *versions, unsigned int count);
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_set_clkname(struct device *dev, const char *name);
@@ -372,22 +369,6 @@ static inline int dev_pm_opp_unregister_notifier(struct device *dev, struct noti
return -EOPNOTSUPP;
}
-static inline struct opp_table *dev_pm_opp_set_supported_hw(struct device *dev,
- const u32 *versions,
- unsigned int count)
-{
- return ERR_PTR(-EOPNOTSUPP);
-}
-
-static inline void dev_pm_opp_put_supported_hw(struct opp_table *opp_table) {}
-
-static inline int devm_pm_opp_set_supported_hw(struct device *dev,
- const u32 *versions,
- unsigned int count)
-{
- return -EOPNOTSUPP;
-}
-
static inline struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev,
int (*set_opp)(struct dev_pm_set_opp_data *data))
{
--
2.31.1.272.g89b43f80a514
next prev parent reply other threads:[~2022-07-01 8:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 8:19 [PATCH V2 00/30] OPP: Add new configuration interface: dev_pm_opp_set_config() Viresh Kumar
2022-07-01 8:19 ` [PATCH V2 01/30] OPP: Track if clock name is configured by platform Viresh Kumar
2022-07-01 8:19 ` [PATCH V2 02/30] OPP: Add dev_pm_opp_set_config() and friends Viresh Kumar
2022-07-01 8:19 ` [PATCH V2 03/30] cpufreq: dt: Migrate to dev_pm_opp_set_config() Viresh Kumar
2022-07-01 8:19 ` [PATCH V2 04/30] cpufreq: imx: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 05/30] cpufreq: qcom-nvmem: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 06/30] cpufreq: sti: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 07/30] cpufreq: sun50i: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 08/30] cpufreq: tegra20: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 09/30] cpufreq: ti: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 10/30] devfreq: exynos: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 11/30] devfreq: sun8i: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 12/30] devfreq: tegra30: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 13/30] drm/lima: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 14/30] drm/msm: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 15/30] drm/panfrost: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 16/30] drm/tegra: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 17/30] media: venus: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 18/30] memory: tegra: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 19/30] mmc: sdhci-msm: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 20/30] OPP: ti: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 21/30] soc/tegra: Add comment over devm_pm_opp_set_clkname() Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 22/30] soc/tegra: Migrate to dev_pm_opp_set_config() Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 23/30] spi: qcom: " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 24/30] serial: " Viresh Kumar
2022-07-01 8:44 ` Greg Kroah-Hartman
2022-07-01 9:24 ` Viresh Kumar
2022-07-01 9:39 ` Greg Kroah-Hartman
2022-07-01 10:01 ` Viresh Kumar
2022-07-01 10:18 ` Greg Kroah-Hartman
2022-07-01 10:29 ` Viresh Kumar
2022-07-01 10:41 ` Greg Kroah-Hartman
2022-07-01 10:45 ` Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 25/30] OPP: Remove dev_pm_opp_set_regulators() and friends Viresh Kumar
2022-07-01 8:20 ` Viresh Kumar [this message]
2022-07-01 8:20 ` [PATCH V2 27/30] OPP: Remove dev_pm_opp_set_clkname() " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 28/30] OPP: Remove dev_pm_opp_register_set_opp_helper() " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 29/30] OPP: Remove dev_pm_opp_attach_genpd() " Viresh Kumar
2022-07-01 8:20 ` [PATCH V2 30/30] OPP: Remove dev_pm_opp_set_prop_name() " Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a653b598ad68f40499750f2d86b266eeac27bd4a.1656660185.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=dmitry.osipenko@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rafael@kernel.org \
--cc=sboyd@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=vireshk@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®