|
@@ -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);
|