diff mbox series

[net-next,v2,8/9] net: mvpp2: Convert to devm_clk_get_enabled() and devm_clk_get_optional_enabled()

Message ID 20240823072122.2053401-9-frank.li@vivo.com (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show
Series net: convert to devm_clk_get_enabled() and devm_clk_get_optional_enabled() | expand

Commit Message

Yangtao Li Aug. 23, 2024, 7:21 a.m. UTC 
Use devm_clk_get_enabled() and devm_clk_get_optional_enabled()
to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2:
-get rid of amount of variables used

 drivers/net/ethernet/marvell/mvpp2/mvpp2.h    |  7 --
 .../net/ethernet/marvell/mvpp2/mvpp2_main.c   | 89 +++++--------------
 2 files changed, 24 insertions(+), 72 deletions(-)

Comments

Marcin Wojtas Aug. 23, 2024, 4:52 p.m. UTC | #1 
pt., 23 sie 2024 o 09:07 Yangtao Li <frank.li@vivo.com> napisał(a):
>
> Use devm_clk_get_enabled() and devm_clk_get_optional_enabled()
> to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
> Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
> Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---


Reviewed-by: Marcin Wojtas <marcin.s.wojtas@gmail.com>

Thanks!
Marcin

> v2:
> -get rid of amount of variables used
>
>  drivers/net/ethernet/marvell/mvpp2/mvpp2.h    |  7 --
>  .../net/ethernet/marvell/mvpp2/mvpp2_main.c   | 89 +++++--------------
>  2 files changed, 24 insertions(+), 72 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
> index 9e02e4367bec..643a645e8097 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
> @@ -1044,13 +1044,6 @@ struct mvpp2 {
>          */
>         struct regmap *sysctrl_base;
>
> -       /* Common clocks */
> -       struct clk *pp_clk;
> -       struct clk *gop_clk;
> -       struct clk *mg_clk;
> -       struct clk *mg_core_clk;
> -       struct clk *axi_clk;
> -
>         /* List of pointers to port structures */
>         int port_count;
>         struct mvpp2_port *port_list[MVPP2_MAX_PORTS];
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> index 2fe8bae4eb3c..0ca2daeb0f90 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> @@ -7561,56 +7561,32 @@ static int mvpp2_probe(struct platform_device *pdev)
>                 priv->max_port_rxqs = 32;
>
>         if (dev_of_node(&pdev->dev)) {
> -               priv->pp_clk = devm_clk_get(&pdev->dev, "pp_clk");
> -               if (IS_ERR(priv->pp_clk))
> -                       return PTR_ERR(priv->pp_clk);
> -               err = clk_prepare_enable(priv->pp_clk);
> -               if (err < 0)
> -                       return err;
> -
> -               priv->gop_clk = devm_clk_get(&pdev->dev, "gop_clk");
> -               if (IS_ERR(priv->gop_clk)) {
> -                       err = PTR_ERR(priv->gop_clk);
> -                       goto err_pp_clk;
> -               }
> -               err = clk_prepare_enable(priv->gop_clk);
> -               if (err < 0)
> -                       goto err_pp_clk;
> +               struct clk *clk;
>
> -               if (priv->hw_version >= MVPP22) {
> -                       priv->mg_clk = devm_clk_get(&pdev->dev, "mg_clk");
> -                       if (IS_ERR(priv->mg_clk)) {
> -                               err = PTR_ERR(priv->mg_clk);
> -                               goto err_gop_clk;
> -                       }
> +               clk = devm_clk_get_enabled(&pdev->dev, "pp_clk");
> +               if (IS_ERR(clk))
> +                       return PTR_ERR(clk);
>
> -                       err = clk_prepare_enable(priv->mg_clk);
> -                       if (err < 0)
> -                               goto err_gop_clk;
> +               /* Get system's tclk rate */
> +               priv->tclk = clk_get_rate(clk);
>
> -                       priv->mg_core_clk = devm_clk_get_optional(&pdev->dev, "mg_core_clk");
> -                       if (IS_ERR(priv->mg_core_clk)) {
> -                               err = PTR_ERR(priv->mg_core_clk);
> -                               goto err_mg_clk;
> -                       }
> +               clk = devm_clk_get_enabled(&pdev->dev, "gop_clk");
> +               if (IS_ERR(clk))
> +                       return PTR_ERR(clk);
>
> -                       err = clk_prepare_enable(priv->mg_core_clk);
> -                       if (err < 0)
> -                               goto err_mg_clk;
> -               }
> +               if (priv->hw_version >= MVPP22) {
> +                       clk = devm_clk_get_enabled(&pdev->dev, "mg_clk");
> +                       if (IS_ERR(clk))
> +                               return PTR_ERR(clk);
>
> -               priv->axi_clk = devm_clk_get_optional(&pdev->dev, "axi_clk");
> -               if (IS_ERR(priv->axi_clk)) {
> -                       err = PTR_ERR(priv->axi_clk);
> -                       goto err_mg_core_clk;
> +                       clk = devm_clk_get_optional_enabled(&pdev->dev, "mg_core_clk");
> +                       if (IS_ERR(clk))
> +                               return PTR_ERR(clk);
>                 }
>
> -               err = clk_prepare_enable(priv->axi_clk);
> -               if (err < 0)
> -                       goto err_mg_core_clk;
> -
> -               /* Get system's tclk rate */
> -               priv->tclk = clk_get_rate(priv->pp_clk);
> +               clk = devm_clk_get_optional_enabled(&pdev->dev, "axi_clk");
> +               if (IS_ERR(clk))
> +                       return PTR_ERR(clk);
>         } else {
>                 err = device_property_read_u32(&pdev->dev, "clock-frequency", &priv->tclk);
>                 if (err) {
> @@ -7622,7 +7598,7 @@ static int mvpp2_probe(struct platform_device *pdev)
>         if (priv->hw_version >= MVPP22) {
>                 err = dma_set_mask(&pdev->dev, MVPP2_DESC_DMA_MASK);
>                 if (err)
> -                       goto err_axi_clk;
> +                       return err;
>                 /* Sadly, the BM pools all share the same register to
>                  * store the high 32 bits of their address. So they
>                  * must all have the same high 32 bits, which forces
> @@ -7630,7 +7606,7 @@ static int mvpp2_probe(struct platform_device *pdev)
>                  */
>                 err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
>                 if (err)
> -                       goto err_axi_clk;
> +                       return err;
>         }
>
>         /* Map DTS-active ports. Should be done before FIFO mvpp2_init */
> @@ -7649,12 +7625,12 @@ static int mvpp2_probe(struct platform_device *pdev)
>         err = mvpp2_init(pdev, priv);
>         if (err < 0) {
>                 dev_err(&pdev->dev, "failed to initialize controller\n");
> -               goto err_axi_clk;
> +               return err;
>         }
>
>         err = mvpp22_tai_probe(&pdev->dev, priv);
>         if (err < 0)
> -               goto err_axi_clk;
> +               return err;
>
>         /* Initialize ports */
>         device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
> @@ -7665,8 +7641,7 @@ static int mvpp2_probe(struct platform_device *pdev)
>
>         if (priv->port_count == 0) {
>                 dev_err(&pdev->dev, "no ports enabled\n");
> -               err = -ENODEV;
> -               goto err_axi_clk;
> +               return -ENODEV;
>         }
>
>         /* Statistics must be gathered regularly because some of them (like
> @@ -7698,16 +7673,6 @@ static int mvpp2_probe(struct platform_device *pdev)
>  err_port_probe:
>         for (i = 0; i < priv->port_count; i++)
>                 mvpp2_port_remove(priv->port_list[i]);
> -err_axi_clk:
> -       clk_disable_unprepare(priv->axi_clk);
> -err_mg_core_clk:
> -       clk_disable_unprepare(priv->mg_core_clk);
> -err_mg_clk:
> -       clk_disable_unprepare(priv->mg_clk);
> -err_gop_clk:
> -       clk_disable_unprepare(priv->gop_clk);
> -err_pp_clk:
> -       clk_disable_unprepare(priv->pp_clk);
>         return err;
>  }
>
> @@ -7745,12 +7710,6 @@ static void mvpp2_remove(struct platform_device *pdev)
>
>         if (!dev_of_node(&pdev->dev))
>                 return;
> -
> -       clk_disable_unprepare(priv->axi_clk);
> -       clk_disable_unprepare(priv->mg_core_clk);
> -       clk_disable_unprepare(priv->mg_clk);
> -       clk_disable_unprepare(priv->pp_clk);
> -       clk_disable_unprepare(priv->gop_clk);
>  }
>
>  static const struct of_device_id mvpp2_match[] = {
> --
> 2.39.0
>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 9e02e4367bec..643a645e8097 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -1044,13 +1044,6 @@  struct mvpp2 {
 	 */
 	struct regmap *sysctrl_base;
 
-	/* Common clocks */
-	struct clk *pp_clk;
-	struct clk *gop_clk;
-	struct clk *mg_clk;
-	struct clk *mg_core_clk;
-	struct clk *axi_clk;
-
 	/* List of pointers to port structures */
 	int port_count;
 	struct mvpp2_port *port_list[MVPP2_MAX_PORTS];
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 2fe8bae4eb3c..0ca2daeb0f90 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -7561,56 +7561,32 @@  static int mvpp2_probe(struct platform_device *pdev)
 		priv->max_port_rxqs = 32;
 
 	if (dev_of_node(&pdev->dev)) {
-		priv->pp_clk = devm_clk_get(&pdev->dev, "pp_clk");
-		if (IS_ERR(priv->pp_clk))
-			return PTR_ERR(priv->pp_clk);
-		err = clk_prepare_enable(priv->pp_clk);
-		if (err < 0)
-			return err;
-
-		priv->gop_clk = devm_clk_get(&pdev->dev, "gop_clk");
-		if (IS_ERR(priv->gop_clk)) {
-			err = PTR_ERR(priv->gop_clk);
-			goto err_pp_clk;
-		}
-		err = clk_prepare_enable(priv->gop_clk);
-		if (err < 0)
-			goto err_pp_clk;
+		struct clk *clk;
 
-		if (priv->hw_version >= MVPP22) {
-			priv->mg_clk = devm_clk_get(&pdev->dev, "mg_clk");
-			if (IS_ERR(priv->mg_clk)) {
-				err = PTR_ERR(priv->mg_clk);
-				goto err_gop_clk;
-			}
+		clk = devm_clk_get_enabled(&pdev->dev, "pp_clk");
+		if (IS_ERR(clk))
+			return PTR_ERR(clk);
 
-			err = clk_prepare_enable(priv->mg_clk);
-			if (err < 0)
-				goto err_gop_clk;
+		/* Get system's tclk rate */
+		priv->tclk = clk_get_rate(clk);
 
-			priv->mg_core_clk = devm_clk_get_optional(&pdev->dev, "mg_core_clk");
-			if (IS_ERR(priv->mg_core_clk)) {
-				err = PTR_ERR(priv->mg_core_clk);
-				goto err_mg_clk;
-			}
+		clk = devm_clk_get_enabled(&pdev->dev, "gop_clk");
+		if (IS_ERR(clk))
+			return PTR_ERR(clk);
 
-			err = clk_prepare_enable(priv->mg_core_clk);
-			if (err < 0)
-				goto err_mg_clk;
-		}
+		if (priv->hw_version >= MVPP22) {
+			clk = devm_clk_get_enabled(&pdev->dev, "mg_clk");
+			if (IS_ERR(clk))
+				return PTR_ERR(clk);
 
-		priv->axi_clk = devm_clk_get_optional(&pdev->dev, "axi_clk");
-		if (IS_ERR(priv->axi_clk)) {
-			err = PTR_ERR(priv->axi_clk);
-			goto err_mg_core_clk;
+			clk = devm_clk_get_optional_enabled(&pdev->dev, "mg_core_clk");
+			if (IS_ERR(clk))
+				return PTR_ERR(clk);
 		}
 
-		err = clk_prepare_enable(priv->axi_clk);
-		if (err < 0)
-			goto err_mg_core_clk;
-
-		/* Get system's tclk rate */
-		priv->tclk = clk_get_rate(priv->pp_clk);
+		clk = devm_clk_get_optional_enabled(&pdev->dev, "axi_clk");
+		if (IS_ERR(clk))
+			return PTR_ERR(clk);
 	} else {
 		err = device_property_read_u32(&pdev->dev, "clock-frequency", &priv->tclk);
 		if (err) {
@@ -7622,7 +7598,7 @@  static int mvpp2_probe(struct platform_device *pdev)
 	if (priv->hw_version >= MVPP22) {
 		err = dma_set_mask(&pdev->dev, MVPP2_DESC_DMA_MASK);
 		if (err)
-			goto err_axi_clk;
+			return err;
 		/* Sadly, the BM pools all share the same register to
 		 * store the high 32 bits of their address. So they
 		 * must all have the same high 32 bits, which forces
@@ -7630,7 +7606,7 @@  static int mvpp2_probe(struct platform_device *pdev)
 		 */
 		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
 		if (err)
-			goto err_axi_clk;
+			return err;
 	}
 
 	/* Map DTS-active ports. Should be done before FIFO mvpp2_init */
@@ -7649,12 +7625,12 @@  static int mvpp2_probe(struct platform_device *pdev)
 	err = mvpp2_init(pdev, priv);
 	if (err < 0) {
 		dev_err(&pdev->dev, "failed to initialize controller\n");
-		goto err_axi_clk;
+		return err;
 	}
 
 	err = mvpp22_tai_probe(&pdev->dev, priv);
 	if (err < 0)
-		goto err_axi_clk;
+		return err;
 
 	/* Initialize ports */
 	device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
@@ -7665,8 +7641,7 @@  static int mvpp2_probe(struct platform_device *pdev)
 
 	if (priv->port_count == 0) {
 		dev_err(&pdev->dev, "no ports enabled\n");
-		err = -ENODEV;
-		goto err_axi_clk;
+		return -ENODEV;
 	}
 
 	/* Statistics must be gathered regularly because some of them (like
@@ -7698,16 +7673,6 @@  static int mvpp2_probe(struct platform_device *pdev)
 err_port_probe:
 	for (i = 0; i < priv->port_count; i++)
 		mvpp2_port_remove(priv->port_list[i]);
-err_axi_clk:
-	clk_disable_unprepare(priv->axi_clk);
-err_mg_core_clk:
-	clk_disable_unprepare(priv->mg_core_clk);
-err_mg_clk:
-	clk_disable_unprepare(priv->mg_clk);
-err_gop_clk:
-	clk_disable_unprepare(priv->gop_clk);
-err_pp_clk:
-	clk_disable_unprepare(priv->pp_clk);
 	return err;
 }
 
@@ -7745,12 +7710,6 @@  static void mvpp2_remove(struct platform_device *pdev)
 
 	if (!dev_of_node(&pdev->dev))
 		return;
-
-	clk_disable_unprepare(priv->axi_clk);
-	clk_disable_unprepare(priv->mg_core_clk);
-	clk_disable_unprepare(priv->mg_clk);
-	clk_disable_unprepare(priv->pp_clk);
-	clk_disable_unprepare(priv->gop_clk);
 }
 
 static const struct of_device_id mvpp2_match[] = {