aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/flexcan.c10
-rw-r--r--drivers/net/ethernet/freescale/fec.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 165a4c798025..7fd8089946fb 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)
802 struct flexcan_priv *priv = netdev_priv(dev); 802 struct flexcan_priv *priv = netdev_priv(dev);
803 int err; 803 int err;
804 804
805 clk_enable(priv->clk); 805 clk_prepare_enable(priv->clk);
806 806
807 err = open_candev(dev); 807 err = open_candev(dev);
808 if (err) 808 if (err)
@@ -824,7 +824,7 @@ static int flexcan_open(struct net_device *dev)
824 out_close: 824 out_close:
825 close_candev(dev); 825 close_candev(dev);
826 out: 826 out:
827 clk_disable(priv->clk); 827 clk_disable_unprepare(priv->clk);
828 828
829 return err; 829 return err;
830} 830}
@@ -838,7 +838,7 @@ static int flexcan_close(struct net_device *dev)
838 flexcan_chip_stop(dev); 838 flexcan_chip_stop(dev);
839 839
840 free_irq(dev->irq, dev); 840 free_irq(dev->irq, dev);
841 clk_disable(priv->clk); 841 clk_disable_unprepare(priv->clk);
842 842
843 close_candev(dev); 843 close_candev(dev);
844 844
@@ -877,7 +877,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
877 struct flexcan_regs __iomem *regs = priv->base; 877 struct flexcan_regs __iomem *regs = priv->base;
878 u32 reg, err; 878 u32 reg, err;
879 879
880 clk_enable(priv->clk); 880 clk_prepare_enable(priv->clk);
881 881
882 /* select "bus clock", chip must be disabled */ 882 /* select "bus clock", chip must be disabled */
883 flexcan_chip_disable(priv); 883 flexcan_chip_disable(priv);
@@ -911,7 +911,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
911 out: 911 out:
912 /* disable core and turn off clocks */ 912 /* disable core and turn off clocks */
913 flexcan_chip_disable(priv); 913 flexcan_chip_disable(priv);
914 clk_disable(priv->clk); 914 clk_disable_unprepare(priv->clk);
915 915
916 return err; 916 return err;
917} 917}
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 20c2e3f3e18a..ddcbbb34d1b9 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1610,7 +1610,7 @@ fec_probe(struct platform_device *pdev)
1610 ret = PTR_ERR(fep->clk); 1610 ret = PTR_ERR(fep->clk);
1611 goto failed_clk; 1611 goto failed_clk;
1612 } 1612 }
1613 clk_enable(fep->clk); 1613 clk_prepare_enable(fep->clk);
1614 1614
1615 ret = fec_enet_init(ndev); 1615 ret = fec_enet_init(ndev);
1616 if (ret) 1616 if (ret)
@@ -1633,7 +1633,7 @@ failed_register:
1633 fec_enet_mii_remove(fep); 1633 fec_enet_mii_remove(fep);
1634failed_mii_init: 1634failed_mii_init:
1635failed_init: 1635failed_init:
1636 clk_disable(fep->clk); 1636 clk_disable_unprepare(fep->clk);
1637 clk_put(fep->clk); 1637 clk_put(fep->clk);
1638failed_clk: 1638failed_clk:
1639 for (i = 0; i < FEC_IRQ_NUM; i++) { 1639 for (i = 0; i < FEC_IRQ_NUM; i++) {
@@ -1666,7 +1666,7 @@ fec_drv_remove(struct platform_device *pdev)
1666 if (irq > 0) 1666 if (irq > 0)
1667 free_irq(irq, ndev); 1667 free_irq(irq, ndev);
1668 } 1668 }
1669 clk_disable(fep->clk); 1669 clk_disable_unprepare(fep->clk);
1670 clk_put(fep->clk); 1670 clk_put(fep->clk);
1671 iounmap(fep->hwp); 1671 iounmap(fep->hwp);
1672 free_netdev(ndev); 1672 free_netdev(ndev);
@@ -1691,7 +1691,7 @@ fec_suspend(struct device *dev)
1691 fec_stop(ndev); 1691 fec_stop(ndev);
1692 netif_device_detach(ndev); 1692 netif_device_detach(ndev);
1693 } 1693 }
1694 clk_disable(fep->clk); 1694 clk_disable_unprepare(fep->clk);
1695 1695
1696 return 0; 1696 return 0;
1697} 1697}
@@ -1702,7 +1702,7 @@ fec_resume(struct device *dev)
1702 struct net_device *ndev = dev_get_drvdata(dev); 1702 struct net_device *ndev = dev_get_drvdata(dev);
1703 struct fec_enet_private *fep = netdev_priv(ndev); 1703 struct fec_enet_private *fep = netdev_priv(ndev);
1704 1704
1705 clk_enable(fep->clk); 1705 clk_prepare_enable(fep->clk);
1706 if (netif_running(ndev)) { 1706 if (netif_running(ndev)) {
1707 fec_restart(ndev, fep->full_duplex); 1707 fec_restart(ndev, fep->full_duplex);
1708 netif_device_attach(ndev); 1708 netif_device_attach(ndev);