@@ -589,8 +589,8 @@ static int xrx200_probe(struct platform_device *pdev)
if (priv->chan_tx.dma.irq < 0)
return -ENOENT;
- /* get the clock */
- priv->clk = devm_clk_get(dev, NULL);
+ /* get the clock and enable clock gate */
+ priv->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(priv->clk)) {
dev_err(dev, "failed to get clock\n");
return PTR_ERR(priv->clk);
@@ -605,11 +605,6 @@ static int xrx200_probe(struct platform_device *pdev)
if (err)
return err;
- /* enable clock gate */
- err = clk_prepare_enable(priv->clk);
- if (err)
- goto err_uninit_dma;
-
/* set IPG to 12 */
xrx200_pmac_mask(priv, PMAC_RX_IPG_MASK, 0xb, PMAC_RX_IPG);
@@ -628,13 +623,10 @@ static int xrx200_probe(struct platform_device *pdev)
err = register_netdev(net_dev);
if (err)
- goto err_unprepare_clk;
+ goto err_uninit_dma;
return 0;
-err_unprepare_clk:
- clk_disable_unprepare(priv->clk);
-
err_uninit_dma:
xrx200_hw_cleanup(priv);
@@ -654,9 +646,6 @@ static void xrx200_remove(struct platform_device *pdev)
/* remove the actual device */
unregister_netdev(net_dev);
- /* release the clock */
- clk_disable_unprepare(priv->clk);
-
/* shut down hardware */
xrx200_hw_cleanup(priv);
}
Use devm_clk_get_enabled() instead of devm_clk_get() + clk_prepare_enable(), which can make the clk consistent with the device life cycle and reduce the risk of unreleased clk resources. Since the device framework has automatically released the clk resource, there is no need to execute clk_disable_unprepare(clk) on the error path, drop the err_unprepare_clk label, and the original error process can change to the err_uninit_dma error path. Some comments have also been adjusted. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- drivers/net/ethernet/lantiq_xrx200.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)