Skip to content

Commit

Permalink
net: flexcan: convert to clk_prepare/clk_unprepare
Browse files Browse the repository at this point in the history
The patch converts flexcan driver to clk_prepare/clk_unprepare by
using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: David S. Miller <davem@davemloft.net>
  • Loading branch information
Shawn Guo committed Dec 28, 2011
1 parent f1f802c commit e735489
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/can/flexcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand All @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e735489

Please sign in to comment.