On Wed, Jan 18, 2017 at 11:01 AM, Marc Kleine-Budde [off-list ref] wrote:

On 01/18/2017 10:43 AM, yegorslists@googlemail.com wrote:

quoted

From: Yegor Yefremov <redacted>

In order to make the driver work with the common clock framework, this
patch converts the clk_enable()/clk_disable() to
clk_prepare_enable()/clk_disable_unprepare().

Can you add the missing error checking for the prepare_enable call?

Will do.

Yegor

quoted

Signed-off-by: Yegor Yefremov <redacted>
---
 drivers/net/can/ti_hecc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 680d1ff..0448cb5 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c

@@ -948,7 +948,8 @@ static int ti_hecc_probe(struct platform_device *pdev)
      netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll,
              HECC_DEF_NAPI_WEIGHT);

-     clk_enable(priv->clk);
+     clk_prepare_enable(priv->clk);
+
      err = register_candev(ndev);
      if (err) {
              dev_err(&pdev->dev, "register_candev() failed\n");

@@ -981,7 +982,7 @@ static int ti_hecc_remove(struct platform_device *pdev)
      struct ti_hecc_priv *priv = netdev_priv(ndev);

      unregister_candev(ndev);
-     clk_disable(priv->clk);
+     clk_disable_unprepare(priv->clk);
      clk_put(priv->clk);
      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
      iounmap(priv->base);

@@ -1006,7 +1007,7 @@ static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state)
      hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
      priv->can.state = CAN_STATE_SLEEPING;

-     clk_disable(priv->clk);
+     clk_disable_unprepare(priv->clk);

      return 0;
 }

@@ -1016,7 +1017,7 @@ static int ti_hecc_resume(struct platform_device *pdev)
      struct net_device *dev = platform_get_drvdata(pdev);
      struct ti_hecc_priv *priv = netdev_priv(dev);

-     clk_enable(priv->clk);
+     clk_prepare_enable(priv->clk);

      hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
      priv->can.state = CAN_STATE_ERROR_ACTIVE;

--
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |