From: Yangtao Li <tiny.windzz@gmail.com>
To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com,
cw00.choi@samsung.com, krzk@kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, digetx@gmail.com,
thierry.reding@gmail.com, jonathanh@nvidia.com, yuq825@gmail.com,
airlied@linux.ie, daniel@ffwll.ch, robdclark@gmail.com,
sean@poorly.run, robh@kernel.org, tomeu.vizoso@collabora.com,
steven.price@arm.com, alyssa.rosenzweig@collabora.com,
stanimir.varbanov@linaro.org, agross@kernel.org,
bjorn.andersson@linaro.org, mchehab@kernel.org,
lukasz.luba@arm.com, adrian.hunter@intel.com,
ulf.hansson@linaro.org, vireshk@kernel.org, nm@ti.com,
sboyd@kernel.org, broonie@kernel.org, gregkh@linuxfoundation.org,
jirislaby@kernel.org, rjw@rjwysocki.net, jcrouse@codeaurora.org,
hoegsberg@google.com, eric@anholt.net, tzimmermann@suse.de,
marijn.suijten@somainline.org, gustavoars@kernel.org,
emil.velikov@collabora.com, jonathan@marek.ca,
akhilpo@codeaurora.org, smasetty@codeaurora.org,
airlied@redhat.com, masneyb@onstation.org,
kalyan_t@codeaurora.org, tanmay@codeaurora.org,
tiny.windzz@gmail.com, ddavenport@chromium.org,
jsanka@codeaurora.org, rnayak@codeaurora.org,
tongtiangen@huawei.com, miaoqinglang@huawei.com,
khsieh@codeaurora.org, abhinavk@codeaurora.org,
chandanu@codeaurora.org, groeck@chromium.org,
varar@codeaurora.org, mka@chromium.org, harigovi@codeaurora.org,
rikard.falkeborn@gmail.com, natechancellor@gmail.com,
georgi.djakov@linaro.org, akashast@codeaurora.org,
parashar@codeaurora.org, dianders@chromium.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org,
lima@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
freedreno@lists.freedesktop.org, linux-media@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: [PATCH 30/31] PM / devfreq: exynos: convert to use devm_pm_opp_* API
Date: Sun, 3 Jan 2021 03:56:39 +0000 [thread overview]
Message-ID: <20210103035639.24076-1-tiny.windzz@gmail.com> (raw)
Use devm_pm_opp_* API to simplify code, and remove opp_table
from exynos_bus.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/devfreq/exynos-bus.c | 42 ++++++++----------------------------
1 file changed, 9 insertions(+), 33 deletions(-)
diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index e689101abc93..51752e5ce980 100644
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -33,7 +33,6 @@ struct exynos_bus {
unsigned long curr_freq;
- struct opp_table *opp_table;
struct clk *clk;
unsigned int ratio;
};
@@ -159,10 +158,7 @@ static void exynos_bus_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev);
- dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
- dev_pm_opp_put_regulators(bus->opp_table);
- bus->opp_table = NULL;
}
static void exynos_bus_passive_exit(struct device *dev)
@@ -171,7 +167,6 @@ static void exynos_bus_passive_exit(struct device *dev)
platform_device_unregister(bus->icc_pdev);
- dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
}
@@ -183,15 +178,13 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
const char *vdd = "vdd";
int i, ret, count, size;
- opp_table = dev_pm_opp_set_regulators(dev, &vdd, 1);
+ opp_table = devm_pm_opp_set_regulators(dev, &vdd, 1);
if (IS_ERR(opp_table)) {
ret = PTR_ERR(opp_table);
dev_err(dev, "failed to set regulators %d\n", ret);
return ret;
}
- bus->opp_table = opp_table;
-
/*
* Get the devfreq-event devices to get the current utilization of
* buses. This raw data will be used in devfreq ondemand governor.
@@ -199,25 +192,20 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
count = devfreq_event_get_edev_count(dev, "devfreq-events");
if (count < 0) {
dev_err(dev, "failed to get the count of devfreq-event dev\n");
- ret = count;
- goto err_regulator;
+ return count;
}
bus->edev_count = count;
size = sizeof(*bus->edev) * count;
bus->edev = devm_kzalloc(dev, size, GFP_KERNEL);
- if (!bus->edev) {
- ret = -ENOMEM;
- goto err_regulator;
- }
+ if (!bus->edev)
+ return -ENOMEM;
for (i = 0; i < count; i++) {
bus->edev[i] = devfreq_event_get_edev_by_phandle(dev,
"devfreq-events", i);
- if (IS_ERR(bus->edev[i])) {
- ret = -EPROBE_DEFER;
- goto err_regulator;
- }
+ if (IS_ERR(bus->edev[i]))
+ return -EPROBE_DEFER;
}
/*
@@ -234,12 +222,6 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
bus->ratio = DEFAULT_SATURATION_RATIO;
return 0;
-
-err_regulator:
- dev_pm_opp_put_regulators(bus->opp_table);
- bus->opp_table = NULL;
-
- return ret;
}
static int exynos_bus_parse_of(struct device_node *np,
@@ -264,7 +246,7 @@ static int exynos_bus_parse_of(struct device_node *np,
}
/* Get the freq and voltage from OPP table to scale the bus freq */
- ret = dev_pm_opp_of_add_table(dev);
+ ret = devm_pm_opp_of_add_table(dev);
if (ret < 0) {
dev_err(dev, "failed to get OPP table\n");
goto err_clk;
@@ -276,15 +258,13 @@ static int exynos_bus_parse_of(struct device_node *np,
if (IS_ERR(opp)) {
dev_err(dev, "failed to find dev_pm_opp\n");
ret = PTR_ERR(opp);
- goto err_opp;
+ goto err_clk;
}
bus->curr_freq = dev_pm_opp_get_freq(opp);
dev_pm_opp_put(opp);
return 0;
-err_opp:
- dev_pm_opp_of_remove_table(dev);
err_clk:
clk_disable_unprepare(bus->clk);
@@ -425,7 +405,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
/* Parse the device-tree to get the resource information */
ret = exynos_bus_parse_of(np, bus);
if (ret < 0)
- goto err_reg;
+ return ret;
if (passive)
ret = exynos_bus_profile_init_passive(bus, profile);
@@ -456,11 +436,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
return 0;
err:
- dev_pm_opp_of_remove_table(dev);
clk_disable_unprepare(bus->clk);
-err_reg:
- dev_pm_opp_put_regulators(bus->opp_table);
- bus->opp_table = NULL;
return ret;
}
--
2.25.1
next reply other threads:[~2021-01-03 3:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-03 3:56 Yangtao Li [this message]
2021-01-05 4:35 ` [PATCH 30/31] PM / devfreq: exynos: convert to use devm_pm_opp_* API Chanwoo Choi
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=20210103035639.24076-1-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=abhinavk@codeaurora.org \
--cc=adrian.hunter@intel.com \
--cc=agross@kernel.org \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=akashast@codeaurora.org \
--cc=akhilpo@codeaurora.org \
--cc=alyssa.rosenzweig@collabora.com \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=chandanu@codeaurora.org \
--cc=cw00.choi@samsung.com \
--cc=daniel@ffwll.ch \
--cc=ddavenport@chromium.org \
--cc=dianders@chromium.org \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=eric@anholt.net \
--cc=festevam@gmail.com \
--cc=freedreno@lists.freedesktop.org \
--cc=georgi.djakov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=groeck@chromium.org \
--cc=gustavoars@kernel.org \
--cc=harigovi@codeaurora.org \
--cc=hoegsberg@google.com \
--cc=jcrouse@codeaurora.org \
--cc=jirislaby@kernel.org \
--cc=jonathan@marek.ca \
--cc=jonathanh@nvidia.com \
--cc=jsanka@codeaurora.org \
--cc=kalyan_t@codeaurora.org \
--cc=kernel@pengutronix.de \
--cc=khsieh@codeaurora.org \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=lima@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=marijn.suijten@somainline.org \
--cc=masneyb@onstation.org \
--cc=mchehab@kernel.org \
--cc=miaoqinglang@huawei.com \
--cc=mka@chromium.org \
--cc=myungjoo.ham@samsung.com \
--cc=natechancellor@gmail.com \
--cc=nm@ti.com \
--cc=parashar@codeaurora.org \
--cc=rikard.falkeborn@gmail.com \
--cc=rjw@rjwysocki.net \
--cc=rnayak@codeaurora.org \
--cc=robdclark@gmail.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=sean@poorly.run \
--cc=shawnguo@kernel.org \
--cc=smasetty@codeaurora.org \
--cc=stanimir.varbanov@linaro.org \
--cc=steven.price@arm.com \
--cc=tanmay@codeaurora.org \
--cc=thierry.reding@gmail.com \
--cc=tomeu.vizoso@collabora.com \
--cc=tongtiangen@huawei.com \
--cc=tzimmermann@suse.de \
--cc=ulf.hansson@linaro.org \
--cc=varar@codeaurora.org \
--cc=vireshk@kernel.org \
--cc=yuq825@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).