| From 160526768d55fca2b58f8852e7ad6e8a547f83ca Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 28 Oct 2013 23:49:21 +0100 |
| Subject: sata_rcar: Convert to clk_prepare/unprepare |
| |
| Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and |
| clk_disable_unprepare() to get ready for the migration to the common |
| clock framework. |
| |
| Cc: linux-ide@vger.kernel.org |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Tejun Heo <tj@kernel.org> |
| (cherry picked from commit 329b4287a4fc1d5d98a9f74b6f4f5d986a6c61f4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/ata/sata_rcar.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c |
| index c2d95e9fb971..1dae9a9009f7 100644 |
| --- a/drivers/ata/sata_rcar.c |
| +++ b/drivers/ata/sata_rcar.c |
| @@ -792,7 +792,7 @@ static int sata_rcar_probe(struct platform_device *pdev) |
| dev_err(&pdev->dev, "failed to get access to sata clock\n"); |
| return PTR_ERR(priv->clk); |
| } |
| - clk_enable(priv->clk); |
| + clk_prepare_enable(priv->clk); |
| |
| host = ata_host_alloc(&pdev->dev, 1); |
| if (!host) { |
| @@ -822,7 +822,7 @@ static int sata_rcar_probe(struct platform_device *pdev) |
| return 0; |
| |
| cleanup: |
| - clk_disable(priv->clk); |
| + clk_disable_unprepare(priv->clk); |
| |
| return ret; |
| } |
| @@ -841,7 +841,7 @@ static int sata_rcar_remove(struct platform_device *pdev) |
| iowrite32(0, base + SATAINTSTAT_REG); |
| iowrite32(0x7ff, base + SATAINTMASK_REG); |
| |
| - clk_disable(priv->clk); |
| + clk_disable_unprepare(priv->clk); |
| |
| return 0; |
| } |
| @@ -861,7 +861,7 @@ static int sata_rcar_suspend(struct device *dev) |
| /* mask */ |
| iowrite32(0x7ff, base + SATAINTMASK_REG); |
| |
| - clk_disable(priv->clk); |
| + clk_disable_unprepare(priv->clk); |
| } |
| |
| return ret; |
| @@ -873,7 +873,7 @@ static int sata_rcar_resume(struct device *dev) |
| struct sata_rcar_priv *priv = host->private_data; |
| void __iomem *base = priv->base; |
| |
| - clk_enable(priv->clk); |
| + clk_prepare_enable(priv->clk); |
| |
| /* ack and mask */ |
| iowrite32(0, base + SATAINTSTAT_REG); |
| -- |
| 1.8.5.rc3 |
| |