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