phy: amlogic: Revert "phy: amlogic: Replace devm_reset_control_array_get()"

This reverts commit 3cc8e86721ad ("phy: amlogic: Replace
devm_reset_control_array_get()") as it caused build failure

drivers/soc/amlogic/meson-ee-pwrc.c: In function 'meson_ee_pwrc_init_domain':
drivers/soc/amlogic/meson-ee-pwrc.c:416:65: error: expected ';' before 'if'

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c
index 2299bab38e05d403008f16374d59dce5a963f84f..58a7507a8422c3a62f6ef5353c99009d12818deb 100644 (file)
--- a/drivers/phy/amlogic/phy-meson-axg-pcie.c
+++ b/drivers/phy/amlogic/phy-meson-axg-pcie.c
@@ -153,7 +153,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_exclusive(dev);
+       priv->reset = devm_reset_control_array_get(dev, false, false);
        if (IS_ERR(priv->reset))
                return PTR_ERR(priv->reset);
 

diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
index 5b471ab80fe289e6b66161292f589077b676672e..ebe3d0ddd304eb165bdd9115501fa1abb6feabdb 100644 (file)
--- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
+++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
@@ -416,7 +416,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_exclusive(dev);
+       priv->reset = devm_reset_control_array_get(dev, false, false);
        if (IS_ERR(priv->reset))
                return PTR_ERR(priv->reset);
 

diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c
index 551edd934ba1389f1d9b91a95a56ca9a07d2460c..5164a4dc23521b4525dbd55de0d909c62bdea29a 100644 (file)
--- a/drivers/soc/amlogic/meson-ee-pwrc.c
+++ b/drivers/soc/amlogic/meson-ee-pwrc.c
@@ -412,7 +412,8 @@ 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_exclusive(&pdev->dev)
+               dom->rstc = devm_reset_control_array_get(&pdev->dev, false,
+                                                        false);
                if (IS_ERR(dom->rstc))
                        return PTR_ERR(dom->rstc);
        }

diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
index a4dba8a9cfbc50bb09c6bba6a7c5ed0de8f879e3..21b4bc811c00744a99ee7597a9d23829efa3df5b 100644 (file)
--- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
+++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
@@ -303,7 +303,7 @@ static int meson_gx_pwrc_vpu_probe(struct platform_device *pdev)
                return PTR_ERR(regmap_hhi);
        }
 
-       rstc = devm_reset_control_array_get_exclusive(&pdev->dev);
+       rstc = devm_reset_control_array_get(&pdev->dev, false, false);
        if (IS_ERR(rstc)) {
                if (PTR_ERR(rstc) != -EPROBE_DEFER)
                        dev_err(&pdev->dev, "failed to get reset lines\n");