aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tc6393xb.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2014-11-06 03:52:38 -0500
committerLee Jones <lee.jones@linaro.org>2014-11-25 11:18:54 -0500
commita64ab6b4cd098f6c2ea959fe9bf1fd3f8b13b1f3 (patch)
tree1d1bab64eff08e4c59295b6fa292bc6d0bf16e49 /drivers/mfd/tc6393xb.c
parent12849b63a4e9e22fb63d0fc967726e8cdf2a19c2 (diff)
mfd: tc6393xb: Prepare/unprepare clocks
Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre(). Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/tc6393xb.c')
-rw-r--r--drivers/mfd/tc6393xb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 0afddf6c37af..d35f11fbeab7 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -665,7 +665,7 @@ static int tc6393xb_probe(struct platform_device *dev)
665 goto err_ioremap; 665 goto err_ioremap;
666 } 666 }
667 667
668 ret = clk_enable(tc6393xb->clk); 668 ret = clk_prepare_enable(tc6393xb->clk);
669 if (ret) 669 if (ret)
670 goto err_clk_enable; 670 goto err_clk_enable;
671 671
@@ -728,7 +728,7 @@ err_gpio_add:
728 gpiochip_remove(&tc6393xb->gpio); 728 gpiochip_remove(&tc6393xb->gpio);
729 tcpd->disable(dev); 729 tcpd->disable(dev);
730err_enable: 730err_enable:
731 clk_disable(tc6393xb->clk); 731 clk_disable_unprepare(tc6393xb->clk);
732err_clk_enable: 732err_clk_enable:
733 iounmap(tc6393xb->scr); 733 iounmap(tc6393xb->scr);
734err_ioremap: 734err_ioremap:
@@ -759,7 +759,7 @@ static int tc6393xb_remove(struct platform_device *dev)
759 gpiochip_remove(&tc6393xb->gpio); 759 gpiochip_remove(&tc6393xb->gpio);
760 760
761 ret = tcpd->disable(dev); 761 ret = tcpd->disable(dev);
762 clk_disable(tc6393xb->clk); 762 clk_disable_unprepare(tc6393xb->clk);
763 iounmap(tc6393xb->scr); 763 iounmap(tc6393xb->scr);
764 release_resource(&tc6393xb->rscr); 764 release_resource(&tc6393xb->rscr);
765 clk_put(tc6393xb->clk); 765 clk_put(tc6393xb->clk);
@@ -787,7 +787,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)
787 ioread8(tc6393xb->scr + SCR_GPI_BCR(i)); 787 ioread8(tc6393xb->scr + SCR_GPI_BCR(i));
788 } 788 }
789 ret = tcpd->suspend(dev); 789 ret = tcpd->suspend(dev);
790 clk_disable(tc6393xb->clk); 790 clk_disable_unprepare(tc6393xb->clk);
791 791
792 return ret; 792 return ret;
793} 793}
@@ -799,7 +799,7 @@ static int tc6393xb_resume(struct platform_device *dev)
799 int ret; 799 int ret;
800 int i; 800 int i;
801 801
802 clk_enable(tc6393xb->clk); 802 clk_prepare_enable(tc6393xb->clk);
803 803
804 ret = tcpd->resume(dev); 804 ret = tcpd->resume(dev);
805 if (ret) 805 if (ret)