diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-10-28 18:49:21 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-10-29 14:40:44 -0400 |
commit | 329b4287a4fc1d5d98a9f74b6f4f5d986a6c61f4 (patch) | |
tree | 25ef748ed653a034d5b45c65f68f51940c3d4026 /drivers/ata/sata_rcar.c | |
parent | 0523f037f65dba10191b0fa9c51266f90ba64630 (diff) |
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>
Diffstat (limited to 'drivers/ata/sata_rcar.c')
-rw-r--r-- | drivers/ata/sata_rcar.c | 10 |
1 files 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) | |||
792 | dev_err(&pdev->dev, "failed to get access to sata clock\n"); | 792 | dev_err(&pdev->dev, "failed to get access to sata clock\n"); |
793 | return PTR_ERR(priv->clk); | 793 | return PTR_ERR(priv->clk); |
794 | } | 794 | } |
795 | clk_enable(priv->clk); | 795 | clk_prepare_enable(priv->clk); |
796 | 796 | ||
797 | host = ata_host_alloc(&pdev->dev, 1); | 797 | host = ata_host_alloc(&pdev->dev, 1); |
798 | if (!host) { | 798 | if (!host) { |
@@ -822,7 +822,7 @@ static int sata_rcar_probe(struct platform_device *pdev) | |||
822 | return 0; | 822 | return 0; |
823 | 823 | ||
824 | cleanup: | 824 | cleanup: |
825 | clk_disable(priv->clk); | 825 | clk_disable_unprepare(priv->clk); |
826 | 826 | ||
827 | return ret; | 827 | return ret; |
828 | } | 828 | } |
@@ -841,7 +841,7 @@ static int sata_rcar_remove(struct platform_device *pdev) | |||
841 | iowrite32(0, base + SATAINTSTAT_REG); | 841 | iowrite32(0, base + SATAINTSTAT_REG); |
842 | iowrite32(0x7ff, base + SATAINTMASK_REG); | 842 | iowrite32(0x7ff, base + SATAINTMASK_REG); |
843 | 843 | ||
844 | clk_disable(priv->clk); | 844 | clk_disable_unprepare(priv->clk); |
845 | 845 | ||
846 | return 0; | 846 | return 0; |
847 | } | 847 | } |
@@ -861,7 +861,7 @@ static int sata_rcar_suspend(struct device *dev) | |||
861 | /* mask */ | 861 | /* mask */ |
862 | iowrite32(0x7ff, base + SATAINTMASK_REG); | 862 | iowrite32(0x7ff, base + SATAINTMASK_REG); |
863 | 863 | ||
864 | clk_disable(priv->clk); | 864 | clk_disable_unprepare(priv->clk); |
865 | } | 865 | } |
866 | 866 | ||
867 | return ret; | 867 | return ret; |
@@ -873,7 +873,7 @@ static int sata_rcar_resume(struct device *dev) | |||
873 | struct sata_rcar_priv *priv = host->private_data; | 873 | struct sata_rcar_priv *priv = host->private_data; |
874 | void __iomem *base = priv->base; | 874 | void __iomem *base = priv->base; |
875 | 875 | ||
876 | clk_enable(priv->clk); | 876 | clk_prepare_enable(priv->clk); |
877 | 877 | ||
878 | /* ack and mask */ | 878 | /* ack and mask */ |
879 | iowrite32(0, base + SATAINTSTAT_REG); | 879 | iowrite32(0, base + SATAINTSTAT_REG); |