Commit 329b4287 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tejun Heo

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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 0523f037
...@@ -792,7 +792,7 @@ static int sata_rcar_probe(struct platform_device *pdev) ...@@ -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"); dev_err(&pdev->dev, "failed to get access to sata clock\n");
return PTR_ERR(priv->clk); return PTR_ERR(priv->clk);
} }
clk_enable(priv->clk); clk_prepare_enable(priv->clk);
host = ata_host_alloc(&pdev->dev, 1); host = ata_host_alloc(&pdev->dev, 1);
if (!host) { if (!host) {
...@@ -822,7 +822,7 @@ static int sata_rcar_probe(struct platform_device *pdev) ...@@ -822,7 +822,7 @@ static int sata_rcar_probe(struct platform_device *pdev)
return 0; return 0;
cleanup: cleanup:
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
return ret; return ret;
} }
...@@ -841,7 +841,7 @@ static int sata_rcar_remove(struct platform_device *pdev) ...@@ -841,7 +841,7 @@ static int sata_rcar_remove(struct platform_device *pdev)
iowrite32(0, base + SATAINTSTAT_REG); iowrite32(0, base + SATAINTSTAT_REG);
iowrite32(0x7ff, base + SATAINTMASK_REG); iowrite32(0x7ff, base + SATAINTMASK_REG);
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
return 0; return 0;
} }
...@@ -861,7 +861,7 @@ static int sata_rcar_suspend(struct device *dev) ...@@ -861,7 +861,7 @@ static int sata_rcar_suspend(struct device *dev)
/* mask */ /* mask */
iowrite32(0x7ff, base + SATAINTMASK_REG); iowrite32(0x7ff, base + SATAINTMASK_REG);
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
} }
return ret; return ret;
...@@ -873,7 +873,7 @@ static int sata_rcar_resume(struct device *dev) ...@@ -873,7 +873,7 @@ static int sata_rcar_resume(struct device *dev)
struct sata_rcar_priv *priv = host->private_data; struct sata_rcar_priv *priv = host->private_data;
void __iomem *base = priv->base; void __iomem *base = priv->base;
clk_enable(priv->clk); clk_prepare_enable(priv->clk);
/* ack and mask */ /* ack and mask */
iowrite32(0, base + SATAINTSTAT_REG); iowrite32(0, base + SATAINTSTAT_REG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment