From: Maciej Purski <m.purski@samsung.com>
To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org
Cc: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Inki Dae <inki.dae@samsung.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
David Airlie <airlied@linux.ie>, Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Kamil Debski <kamil@wypas.org>,
Jeongtae Park <jtp.park@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Russell King <linux@armlinux.org.uk>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Thibault Saunier <thibault.saunier@osg.samsung.com>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Hans Verkuil <hansverk@cisco.com>,
Hoegeun Kwon <hoegeun.kwon@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Maciej Purski <m.purski@samsung.com>
Subject: [PATCH 8/8] [media] s5p-mfc: Use clk bulk API
Date: Mon, 19 Feb 2018 16:44:06 +0100 [thread overview]
Message-ID: <1519055046-2399-9-git-send-email-m.purski@samsung.com> (raw)
In-Reply-To: <1519055046-2399-1-git-send-email-m.purski@samsung.com>
Using bulk clk functions simplifies the driver's code. Use devm_clk_bulk
functions instead of iterating over an array of clks.
Signed-off-by: Maciej Purski <m.purski@samsung.com>
---
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 6 ++--
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 41 +++++++++----------------
2 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 76119a8..da3f0b3 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -192,9 +192,9 @@ struct s5p_mfc_buf {
* struct s5p_mfc_pm - power management data structure
*/
struct s5p_mfc_pm {
- struct clk *clock_gate;
- const char * const *clk_names;
- struct clk *clocks[MFC_MAX_CLOCKS];
+ struct clk *clock_gate;
+ const char * const *clk_names;
+ struct clk_bulk_data *clocks;
int num_clocks;
bool use_clock_gating;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
index eb85ced..857f6ea 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
@@ -24,7 +24,7 @@ static atomic_t clk_ref;
int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
{
- int i;
+ int ret;
pm = &dev->pm;
p_dev = dev;
@@ -35,17 +35,17 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
pm->clock_gate = NULL;
/* clock control */
- for (i = 0; i < pm->num_clocks; i++) {
- pm->clocks[i] = devm_clk_get(pm->device, pm->clk_names[i]);
- if (IS_ERR(pm->clocks[i])) {
- mfc_err("Failed to get clock: %s\n",
- pm->clk_names[i]);
- return PTR_ERR(pm->clocks[i]);
- }
- }
+ pm->clocks = devm_clk_bulk_alloc(pm->device, pm->num_clocks,
+ pm->clk_names);
+ if (IS_ERR(pm->clocks))
+ return PTR_ERR(pm->clocks);
+
+ ret = devm_clk_bulk_get(pm->device, pm->num_clocks, pm->clocks);
+ if (ret < 0)
+ return ret;
if (dev->variant->use_clock_gating)
- pm->clock_gate = pm->clocks[0];
+ pm->clock_gate = pm->clocks[0].clk;
pm_runtime_enable(pm->device);
atomic_set(&clk_ref, 0);
@@ -75,43 +75,32 @@ void s5p_mfc_clock_off(void)
int s5p_mfc_power_on(void)
{
- int i, ret = 0;
+ int ret = 0;
ret = pm_runtime_get_sync(pm->device);
if (ret < 0)
return ret;
/* clock control */
- for (i = 0; i < pm->num_clocks; i++) {
- ret = clk_prepare_enable(pm->clocks[i]);
- if (ret < 0) {
- mfc_err("clock prepare failed for clock: %s\n",
- pm->clk_names[i]);
- i++;
- goto err;
- }
- }
+ ret = clk_bulk_prepare_enable(pm->num_clocks, pm->clocks);
+ if (ret < 0)
+ goto err;
/* prepare for software clock gating */
clk_disable(pm->clock_gate);
return 0;
err:
- while (--i > 0)
- clk_disable_unprepare(pm->clocks[i]);
pm_runtime_put(pm->device);
return ret;
}
int s5p_mfc_power_off(void)
{
- int i;
-
/* finish software clock gating */
clk_enable(pm->clock_gate);
- for (i = 0; i < pm->num_clocks; i++)
- clk_disable_unprepare(pm->clocks[i]);
+ clk_bulk_disable_unprepare(pm->num_clocks, pm->clocks);
return pm_runtime_put_sync(pm->device);
}
--
2.7.4
next prev parent reply other threads:[~2018-02-19 15:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180219154456eucas1p178a82b3bb643028dc7c99ccca9c6eaca@eucas1p1.samsung.com>
2018-02-19 15:43 ` [PATCH 0/8] Use clk bulk API in exynos5433 drivers Maciej Purski
[not found] ` <CGME20180219154456eucas1p15f4073beaf61312238f142f217a8bb3c@eucas1p1.samsung.com>
2018-02-19 15:43 ` [PATCH 1/8] clk: Add clk_bulk_alloc functions Maciej Purski
2018-02-19 16:29 ` Robin Murphy
2018-02-20 9:36 ` Marek Szyprowski
2018-02-20 14:19 ` Robin Murphy
2018-03-15 22:55 ` Stephen Boyd
2018-02-19 18:22 ` Emil Velikov
[not found] ` <CGME20180219154457eucas1p163264992903698a8878aa5abbc8aa17b@eucas1p1.samsung.com>
2018-02-19 15:44 ` [PATCH 2/8] media: s5p-jpeg: Use bulk clk API Maciej Purski
2018-02-20 0:22 ` kbuild test robot
[not found] ` <CGME20180219154458eucas1p1b4e728757e78f3d5dde5c9aa565a5d20@eucas1p1.samsung.com>
2018-02-19 15:44 ` [PATCH 3/8] drm/exynos/decon: Use clk bulk API Maciej Purski
[not found] ` <CGME20180219154459eucas1p147525b88de5d34f646aa25cb8de1f1d0@eucas1p1.samsung.com>
2018-02-19 15:44 ` [PATCH 4/8] drm/exynos/dsi: " Maciej Purski
2018-02-20 1:39 ` kbuild test robot
[not found] ` <CGME20180219154500eucas1p25e9f3bf44901cb2bbe9720cdc5bdd855@eucas1p2.samsung.com>
2018-02-19 15:44 ` [PATCH 5/8] drm/exynos: mic: " Maciej Purski
[not found] ` <CGME20180219154501eucas1p1e16a883d2eb0c8a99bafce5d71656066@eucas1p1.samsung.com>
2018-02-19 15:44 ` [PATCH 6/8] drm/exynos/hdmi: " Maciej Purski
[not found] ` <CGME20180219154502eucas1p20e8daf3edc6737817f8d62db5a2099f2@eucas1p2.samsung.com>
2018-02-19 15:44 ` [PATCH 7/8] [media] exynos-gsc: " Maciej Purski
2018-02-19 22:38 ` kbuild test robot
[not found] ` <CGME20180219154503eucas1p1c8893411994bd1152d0ce5b386118416@eucas1p1.samsung.com>
2018-02-19 15:44 ` Maciej Purski [this message]
2018-02-20 1:56 ` [PATCH 8/8] [media] s5p-mfc: " kbuild test robot
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=1519055046-2399-9-git-send-email-m.purski@samsung.com \
--to=m.purski@samsung.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=andrzej.p@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hansverk@cisco.com \
--cc=hoegeun.kwon@samsung.com \
--cc=inki.dae@samsung.com \
--cc=jacek.anaszewski@gmail.com \
--cc=javier@osg.samsung.com \
--cc=jtp.park@samsung.com \
--cc=jy0922.shim@samsung.com \
--cc=kamil@wypas.org \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=mturquette@baylibre.com \
--cc=s.nawrocki@samsung.com \
--cc=sboyd@kernel.org \
--cc=sw0312.kim@samsung.com \
--cc=thibault.saunier@osg.samsung.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).