diff options
author | Vinod Koul <vkoul@kernel.org> | 2020-11-17 15:26:17 +0530 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2020-11-17 15:29:42 +0530 |
commit | 53cde0fe020fd9594820307661e9b9c42821722d (patch) | |
tree | 13a936aa58f1ed226f94e8c60f6d2721b8e1eff5 | |
parent | 50c0133cd154090446bc19e466df57502f422644 (diff) | |
download | lwn-53cde0fe020fd9594820307661e9b9c42821722d.tar.gz lwn-53cde0fe020fd9594820307661e9b9c42821722d.zip |
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>
-rw-r--r-- | drivers/phy/amlogic/phy-meson-axg-pcie.c | 2 | ||||
-rw-r--r-- | drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 | ||||
-rw-r--r-- | drivers/soc/amlogic/meson-ee-pwrc.c | 3 | ||||
-rw-r--r-- | drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/phy/amlogic/phy-meson-axg-pcie.c b/drivers/phy/amlogic/phy-meson-axg-pcie.c index 2299bab38e05..58a7507a8422 100644 --- 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 5b471ab80fe2..ebe3d0ddd304 100644 --- 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 551edd934ba1..5164a4dc2352 100644 --- 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 a4dba8a9cfbc..21b4bc811c00 100644 --- 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"); |