Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx/clk

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index e02337953f41..fdd0f3fbeabb 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -802,7 +802,7 @@ static int flexcan_open(struct net_device *dev)
         struct flexcan_priv *priv = netdev_priv(dev);
         int err;
 
-        clk_enable(priv->clk);
+        clk_prepare_enable(priv->clk);
 
         err = open_candev(dev);
         if (err)
@@ -824,7 +824,7 @@ static int flexcan_open(struct net_device *dev)
  out_close:
         close_candev(dev);
  out:
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         return err;
 }
@@ -838,7 +838,7 @@ static int flexcan_close(struct net_device *dev)
         flexcan_chip_stop(dev);
 
         free_irq(dev->irq, dev);
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         close_candev(dev);
 
@@ -877,7 +877,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
         struct flexcan_regs __iomem *regs = priv->base;
         u32 reg, err;
 
-        clk_enable(priv->clk);
+        clk_prepare_enable(priv->clk);
 
         /* select "bus clock", chip must be disabled */
         flexcan_chip_disable(priv);
@@ -911,7 +911,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
  out:
         /* disable core and turn off clocks */
         flexcan_chip_disable(priv);
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         return err;
 }
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index c136230d50bb..112af9b056dc 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1591,7 +1591,7 @@ fec_probe(struct platform_device *pdev)
                 ret = PTR_ERR(fep->clk);
                 goto failed_clk;
         }
-        clk_enable(fep->clk);
+        clk_prepare_enable(fep->clk);
 
         ret = fec_enet_init(ndev);
         if (ret)
@@ -1614,7 +1614,7 @@ failed_register:
         fec_enet_mii_remove(fep);
 failed_mii_init:
 failed_init:
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
         clk_put(fep->clk);
 failed_clk:
         for (i = 0; i < FEC_IRQ_NUM; i++) {
@@ -1641,7 +1641,7 @@ fec_drv_remove(struct platform_device *pdev)
 
         fec_stop(ndev);
         fec_enet_mii_remove(fep);
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
         clk_put(fep->clk);
         iounmap(fep->hwp);
         unregister_netdev(ndev);
@@ -1667,7 +1667,7 @@ fec_suspend(struct device *dev)
                 fec_stop(ndev);
                 netif_device_detach(ndev);
         }
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
 
         return 0;
 }
@@ -1678,7 +1678,7 @@ fec_resume(struct device *dev)
         struct net_device *ndev = dev_get_drvdata(dev);
         struct fec_enet_private *fep = netdev_priv(ndev);
 
-        clk_enable(fep->clk);
+        clk_prepare_enable(fep->clk);
         if (netif_running(ndev)) {
                 fec_restart(ndev, fep->full_duplex);
                 netif_device_attach(ndev);