phy: amlogic: Replace devm_reset_control_array_get()
Subsystems (2)
PATCH 1/1 phy: amlogic: Replace devm_reset_control_array_get()
devm_reset_control_array_get_exclusive() looks more readable
Signed-off-by Yejune Deng <[email protected]>
--- drivers/phy/amlogic/phy-meson-axg-pcie.c | 2 +- drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 +- drivers/soc/amlogic/meson-ee-pwrc.c | 3 +-- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/phy/amlogic/phy-meson-axg-pcie.c +1 -1
@@ -155,7 +155,7 @@ static int phy_axg_pcie_probe(struct platform_device *pdev)if (IS_ERR (priv->regmap))return PTR_ERR (priv->regmap); - priv->reset =devm_reset_control_array_get (dev, false, false); + priv->reset =devm_reset_control_array_get_exclusive (dev);if (IS_ERR (priv->reset))return PTR_ERR (priv->reset);
drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c +1 -1
@@ -418,7 +418,7 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)if (ret) goto err_disable_clk_ref; - priv->reset =devm_reset_control_array_get (dev, false, false); + priv->reset =devm_reset_control_array_get_exclusive (dev);if (IS_ERR (priv->reset))return PTR_ERR (priv->reset);
drivers/soc/amlogic/meson-ee-pwrc.c +1 -2
@@ -413,8 +413,7 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev,dev_warn (&pdev->dev,"Invalid resets count %d for domain %s\n" , count, dom->desc.name); - dom->rstc =devm_reset_control_array_get (&pdev->dev, false, - false); + dom->rstc =devm_reset_control_array_get_exclusive (&pdev->dev);if (IS_ERR (dom->rstc))return PTR_ERR (dom->rstc); }
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +1 -1
@@ -304,7 +304,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)return PTR_ERR (regmap_hhi); } - rstc =devm_reset_control_array_get (&pdev->dev, false, false); + rstc =devm_reset_control_array_get_exclusive (&pdev->dev);if (IS_ERR (rstc)) {if (PTR_ERR (rstc) != -EPROBE_DEFER )dev_err (&pdev->dev,"failed to get reset lines\n" );
Signature · 1 line
1.9.1
Quoted 56 lines · Yejune Deng
devm_reset_control_array_get_exclusive()looks more readableSigned-off-by Yejune Deng <[email protected]>--- drivers/phy/amlogic/phy-meson-axg-pcie.c | 2 +- drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 +- drivers/soc/amlogic/meson-ee-pwrc.c | 3 +-- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)drivers/phy/amlogic/phy-meson-axg-pcie.c +1
-1@@ -155,7 +155,7 @@ static int phy_axg_pcie_probe(struct platform_device *pdev)if (IS_ERR (priv->regmap))return PTR_ERR (priv->regmap); - priv->reset =devm_reset_control_array_get (dev, false, false); + priv->reset =devm_reset_control_array_get_exclusive (dev);if (IS_ERR (priv->reset))return PTR_ERR (priv->reset);drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c +1
-1@@ -418,7 +418,7 @@ static int phy_g12a_usb3_pcie_probe(struct platform_device *pdev)if (ret) goto err_disable_clk_ref; - priv->reset =devm_reset_control_array_get (dev, false, false); + priv->reset =devm_reset_control_array_get_exclusive (dev);if (IS_ERR (priv->reset))return PTR_ERR (priv->reset);drivers/soc/amlogic/meson-ee-pwrc.c +1
-2@@ -413,8 +413,7 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev,dev_warn (&pdev->dev,"Invalid resets count %d for domain %s\n" , count, dom->desc.name); - dom->rstc =devm_reset_control_array_get (&pdev->dev, false, - false); + dom->rstc =devm_reset_control_array_get_exclusive (&pdev->dev);if (IS_ERR (dom->rstc))return PTR_ERR (dom->rstc); }drivers/soc/amlogic/meson-gx-pwrc-vpu.c +0
-0
drivers/soc/amlogic/meson-gx-pwrc-vpu.c static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev) · line 310
Quoted 8 lines
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +1
-1@@ -304,7 +304,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)return PTR_ERR (regmap_hhi); } - rstc =devm_reset_control_array_get (&pdev->dev, false, false); + rstc =devm_reset_control_array_get_exclusive (&pdev->dev);if (IS_ERR (rstc)) {if (PTR_ERR (rstc) != -EPROBE_DEFER )dev_err (&pdev->dev,"failed to get reset lines\n" );
Reviewed-by Neil Armstrong <[email protected]>
Martin Blumenstingl
reviewerHi Yejune,
Quoted 9 lines · Yejune Deng
devm_reset_control_array_get_exclusive()looks more readableSigned-off-by Yejune Deng <[email protected]>--- drivers/phy/amlogic/phy-meson-axg-pcie.c | 2 +- drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 +- drivers/soc/amlogic/meson-ee-pwrc.c | 3 +-- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 2 +-
what's the reason behind including PHY and SoC driver changes in one patch? I think both main directories will be applied by different maintainers, so I believe the patch should be split into:
- one drivers/phy patch
- another drivers/soc patch
Best regards,
Martin