From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/12] mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
Date: Tue, 20 Dec 2011 14:46:01 +0100 [thread overview]
Message-ID: <201112201446.01698.marek.vasut@gmail.com> (raw)
In-Reply-To: <1324382443-4439-7-git-send-email-shawn.guo@linaro.org>
> The patch converts gpmi nand driver to clk_prepare/clk_unprepare by
> using helper functions clk_prepare_enable/clk_disable_unprepare.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: Huang Shijie <b32955@freescale.com>
> Cc: Artem Bityutskiy <artem.bityutskiy@intel.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index de4db76..2a56fc6 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> @@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)
> struct resources *r = &this->resources;
> int ret;
>
> - ret = clk_enable(r->clock);
> + ret = clk_prepare_enable(r->clock);
> if (ret)
> goto err_out;
> ret = gpmi_reset_block(r->gpmi_regs, false);
> @@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)
> /* Select BCH ECC. */
> writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
>
> - clk_disable(r->clock);
> + clk_disable_unprepare(r->clock);
> return 0;
> err_out:
> return ret;
> @@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
> ecc_strength = bch_geo->ecc_strength >> 1;
> page_size = bch_geo->page_size;
>
> - ret = clk_enable(r->clock);
> + ret = clk_prepare_enable(r->clock);
> if (ret)
> goto err_out;
>
> @@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
> writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
> r->bch_regs + HW_BCH_CTRL_SET);
>
> - clk_disable(r->clock);
> + clk_disable_unprepare(r->clock);
> return 0;
> err_out:
> return ret;
> @@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
> int ret;
>
> /* Enable the clock. */
> - ret = clk_enable(r->clock);
> + ret = clk_prepare_enable(r->clock);
> if (ret) {
> pr_err("We failed in enable the clk\n");
> goto err_out;
> @@ -773,7 +773,7 @@ err_out:
> void gpmi_end(struct gpmi_nand_data *this)
> {
> struct resources *r = &this->resources;
> - clk_disable(r->clock);
> + clk_disable_unprepare(r->clock);
> }
>
> /* Clears a BCH interrupt. */
Yes, this is still all very easy conversion :)
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2011-12-20 13:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 12:00 [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Shawn Guo
2011-12-20 12:00 ` [PATCH 01/12] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:09 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 02/12] arm/mxs: convert platform code to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:44 ` Marek Vasut
2011-12-20 21:11 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 03/12] net: fec: add clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 04/12] dma: mxs-dma: convert to clk_prepare/clk_unprepare Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-23 17:35 ` Vinod Koul
2011-12-20 12:00 ` [PATCH 05/12] mmc: mxs-mmc: " Shawn Guo
2011-12-20 13:45 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 06/12] mtd: gpmi-lib: " Shawn Guo
2011-12-20 13:46 ` Marek Vasut [this message]
2011-12-20 12:00 ` [PATCH 07/12] net: flexcan: " Shawn Guo
2011-12-20 13:48 ` Marek Vasut
2011-12-20 14:23 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 08/12] serial: mxs-auart: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-20 14:07 ` Uwe Kleine-König
2011-12-20 21:15 ` Russell King - ARM Linux
2011-12-20 21:28 ` Marek Vasut
2011-12-20 22:24 ` Russell King - ARM Linux
2011-12-21 1:06 ` Marek Vasut
2011-12-20 14:27 ` Shawn Guo
2011-12-20 12:00 ` [PATCH 09/12] video: mxsfb: " Shawn Guo
2011-12-20 13:49 ` Marek Vasut
2011-12-21 2:11 ` Florian Tobias Schandinat
2011-12-20 12:00 ` [PATCH 10/12] ASoC: mxs-saif: " Shawn Guo
2011-12-20 11:55 ` Mark Brown
2011-12-20 13:49 ` Marek Vasut
2011-12-20 12:00 ` [PATCH 11/12] clk: add config option HAVE_CLK_PREPARE into Kconfig Shawn Guo
2011-12-20 12:00 ` [PATCH 12/12] arm/mxs: select HAVE_CLK_PREPARE for clock Shawn Guo
2011-12-20 13:43 ` [PATCH 0/12] Add clk_prepare/clk_unprepare for mxs clock api Marek Vasut
2011-12-20 14:05 ` Shawn Guo
2011-12-20 13:59 ` Marek Vasut
2011-12-20 14:21 ` Shawn Guo
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=201112201446.01698.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).