From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Mark Brown <broonie@kernel.org>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>
Cc: linux-spi@vger.kernel.org, devicetree@vger.kernel.org,
linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Subject: [PATCH 2/9] spi: rspi: Convert to clk_prepare_enable/disable_unprepare
Date: Sun, 12 Jan 2014 12:13:35 +0100 [thread overview]
Message-ID: <1389525222-3482-3-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1389525222-3482-1-git-send-email-geert@linux-m68k.org>
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Get the driver ready for the migration to the common clock framework by
calling clk_prepare_enable() and clk_disable_unprepare().
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
drivers/spi/spi-rspi.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 5ce2127b2b43..b6439c9505ac 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1066,7 +1066,7 @@ static int rspi_remove(struct platform_device *pdev)
struct rspi_data *rspi = platform_get_drvdata(pdev);
rspi_release_dma(rspi);
- clk_disable(rspi->clk);
+ clk_disable_unprepare(rspi->clk);
return 0;
}
@@ -1115,7 +1115,12 @@ static int rspi_probe(struct platform_device *pdev)
ret = PTR_ERR(rspi->clk);
goto error1;
}
- clk_enable(rspi->clk);
+
+ ret = clk_prepare_enable(rspi->clk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "unable to prepare/enable clock\n");
+ goto error1;
+ }
INIT_LIST_HEAD(&rspi->queue);
spin_lock_init(&rspi->lock);
@@ -1177,7 +1182,7 @@ static int rspi_probe(struct platform_device *pdev)
error3:
rspi_release_dma(rspi);
error2:
- clk_disable(rspi->clk);
+ clk_disable_unprepare(rspi->clk);
error1:
spi_master_put(master);
--
1.7.9.5
next prev parent reply other threads:[~2014-01-12 11:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-12 11:13 [PATCH 0/9] Renesas RSPI/QSPI DT support Geert Uytterhoeven
2014-01-12 11:13 ` [PATCH 1/9] spi: rspi: Add missing clk_disable() calls in error and cleanup paths Geert Uytterhoeven
[not found] ` <1389525222-3482-2-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
2014-01-13 11:59 ` Mark Brown
[not found] ` <20140113115947.GL29039-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-01-13 12:17 ` Geert Uytterhoeven
2014-01-13 12:23 ` Mark Brown
2014-01-12 11:13 ` Geert Uytterhoeven [this message]
2014-01-12 11:13 ` [PATCH V3 4/9] spi: rspi: Add DT support Geert Uytterhoeven
[not found] ` <1389525222-3482-5-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
2014-01-13 12:08 ` Mark Brown
2014-01-12 11:13 ` [PATCH 5/9] ARM: shmobile: r7s72100: Add RSPI clocks for DT Geert Uytterhoeven
2014-01-12 11:13 ` [PATCH V3 6/9] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Geert Uytterhoeven
2014-01-12 11:13 ` [PATCH V3 7/9] ARM: shmobile: genmai reference: " Geert Uytterhoeven
2014-01-12 11:13 ` [PATCH 8/9] ARM: shmobile: r8a7791 dtsi: Add QSPI node Geert Uytterhoeven
[not found] ` <1389525222-3482-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
2014-01-12 11:13 ` [PATCH 3/9] spi: rspi: Use NULL as the clock ID Geert Uytterhoeven
2014-01-12 11:13 ` [PATCH 9/9] ARM: shmobile: koelsch: Add QSPI nodes Geert Uytterhoeven
2014-01-12 12:55 ` [PATCH 0/9] Renesas RSPI/QSPI DT support Geert Uytterhoeven
[not found] ` <CAMuHMdWmFa-XsderYDp4jMw6r7fnwpm5XgQGfz8gEbCryXEkHg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-14 0:53 ` Simon Horman
[not found] ` <20140114005312.GF18217-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2014-01-14 8:40 ` Geert Uytterhoeven
2014-01-14 23:49 ` Simon Horman
[not found] ` <20140114234951.GA8769-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2014-01-15 8:46 ` Geert Uytterhoeven
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=1389525222-3482-3-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@linux-m68k.org \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=magnus.damm@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).