* [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code
@ 2022-08-30 17:16 Heiner Kallweit
2022-08-31 8:58 ` Neil Armstrong
2022-09-04 15:20 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Heiner Kallweit @ 2022-08-30 17:16 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl
Cc: linux-phy, linux-arm-kernel, open list:ARM/Amlogic Meson...
Simplify the code by using devm_clk_get_enabled().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
.../phy/amlogic/phy-meson-g12a-usb3-pcie.c | 32 ++++---------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
index 54d65a6f0..d2a1da8d9 100644
--- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
+++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
@@ -388,7 +388,6 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
struct phy_g12a_usb3_pcie_priv *priv;
struct phy_provider *phy_provider;
void __iomem *base;
- int ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -408,43 +407,24 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
if (IS_ERR(priv->regmap_cr))
return PTR_ERR(priv->regmap_cr);
- priv->clk_ref = devm_clk_get(dev, "ref_clk");
+ priv->clk_ref = devm_clk_get_enabled(dev, "ref_clk");
if (IS_ERR(priv->clk_ref))
return PTR_ERR(priv->clk_ref);
- ret = clk_prepare_enable(priv->clk_ref);
- if (ret)
- return ret;
-
priv->reset = devm_reset_control_array_get_exclusive(dev);
- if (IS_ERR(priv->reset)) {
- ret = PTR_ERR(priv->reset);
- goto err_disable_clk_ref;
- }
+ if (IS_ERR(priv->reset))
+ return PTR_ERR(priv->reset);
priv->phy = devm_phy_create(dev, np, &phy_g12a_usb3_pcie_ops);
- if (IS_ERR(priv->phy)) {
- ret = PTR_ERR(priv->phy);
- dev_err_probe(dev, ret, "failed to create PHY\n");
- goto err_disable_clk_ref;
- }
+ if (IS_ERR(priv->phy))
+ return dev_err_probe(dev, PTR_ERR(priv->phy), "failed to create PHY\n");
phy_set_drvdata(priv->phy, priv);
dev_set_drvdata(dev, priv);
phy_provider = devm_of_phy_provider_register(dev,
phy_g12a_usb3_pcie_xlate);
- if (IS_ERR(phy_provider)) {
- ret = PTR_ERR(phy_provider);
- goto err_disable_clk_ref;
- }
-
- return 0;
-
-err_disable_clk_ref:
- clk_disable_unprepare(priv->clk_ref);
-
- return ret;
+ return PTR_ERR_OR_ZERO(phy_provider);
}
static const struct of_device_id phy_g12a_usb3_pcie_of_match[] = {
--
2.37.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code
2022-08-30 17:16 [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code Heiner Kallweit
@ 2022-08-31 8:58 ` Neil Armstrong
2022-09-04 15:20 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Neil Armstrong @ 2022-08-31 8:58 UTC (permalink / raw)
To: Heiner Kallweit, Kishon Vijay Abraham I, Vinod Koul,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl
Cc: linux-phy, linux-arm-kernel, open list:ARM/Amlogic Meson...
On 30/08/2022 19:16, Heiner Kallweit wrote:
> Simplify the code by using devm_clk_get_enabled().
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> .../phy/amlogic/phy-meson-g12a-usb3-pcie.c | 32 ++++---------------
> 1 file changed, 6 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> index 54d65a6f0..d2a1da8d9 100644
> --- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> +++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
> @@ -388,7 +388,6 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
> struct phy_g12a_usb3_pcie_priv *priv;
> struct phy_provider *phy_provider;
> void __iomem *base;
> - int ret;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> @@ -408,43 +407,24 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)
> if (IS_ERR(priv->regmap_cr))
> return PTR_ERR(priv->regmap_cr);
>
> - priv->clk_ref = devm_clk_get(dev, "ref_clk");
> + priv->clk_ref = devm_clk_get_enabled(dev, "ref_clk");
> if (IS_ERR(priv->clk_ref))
> return PTR_ERR(priv->clk_ref);
>
> - ret = clk_prepare_enable(priv->clk_ref);
> - if (ret)
> - return ret;
> -
> priv->reset = devm_reset_control_array_get_exclusive(dev);
> - if (IS_ERR(priv->reset)) {
> - ret = PTR_ERR(priv->reset);
> - goto err_disable_clk_ref;
> - }
> + if (IS_ERR(priv->reset))
> + return PTR_ERR(priv->reset);
>
> priv->phy = devm_phy_create(dev, np, &phy_g12a_usb3_pcie_ops);
> - if (IS_ERR(priv->phy)) {
> - ret = PTR_ERR(priv->phy);
> - dev_err_probe(dev, ret, "failed to create PHY\n");
> - goto err_disable_clk_ref;
> - }
> + if (IS_ERR(priv->phy))
> + return dev_err_probe(dev, PTR_ERR(priv->phy), "failed to create PHY\n");
>
> phy_set_drvdata(priv->phy, priv);
> dev_set_drvdata(dev, priv);
>
> phy_provider = devm_of_phy_provider_register(dev,
> phy_g12a_usb3_pcie_xlate);
> - if (IS_ERR(phy_provider)) {
> - ret = PTR_ERR(phy_provider);
> - goto err_disable_clk_ref;
> - }
> -
> - return 0;
> -
> -err_disable_clk_ref:
> - clk_disable_unprepare(priv->clk_ref);
> -
> - return ret;
> + return PTR_ERR_OR_ZERO(phy_provider);
> }
>
> static const struct of_device_id phy_g12a_usb3_pcie_of_match[] = {
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code
2022-08-30 17:16 [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code Heiner Kallweit
2022-08-31 8:58 ` Neil Armstrong
@ 2022-09-04 15:20 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2022-09-04 15:20 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Kishon Vijay Abraham I, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl, linux-phy, linux-arm-kernel,
open list:ARM/Amlogic Meson...
On 30-08-22, 19:16, Heiner Kallweit wrote:
> Simplify the code by using devm_clk_get_enabled().
Applied, thanks
--
~Vinod
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-04 15:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-30 17:16 [PATCH] phy: amlogic: use devm_clk_get_enabled() to simplify the code Heiner Kallweit
2022-08-31 8:58 ` Neil Armstrong
2022-09-04 15:20 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).