PCI: rockchip: Explicitly request exclusive reset control

Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls to
explicitly state whether the driver needs exclusive or shared reset control
behavior. Convert all drivers requesting exclusive resets to the explicit
API call so the temporary transition helpers can be removed.

No functional changes.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Shawn Lin <shawn.lin@rock-chips.com>

diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
index 168505777533d1fef3150a5dd291e506f5c17a6a..9c631e5adde0ad88278401f5e4258218aee03c17 100644 (file)
--- a/drivers/pci/host/pcie-rockchip.c
+++ b/drivers/pci/host/pcie-rockchip.c
@@ -979,49 +979,50 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
        if (rockchip->link_gen < 0 || rockchip->link_gen > 2)
                rockchip->link_gen = 2;
 
-       rockchip->core_rst = devm_reset_control_get(dev, "core");
+       rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core");
        if (IS_ERR(rockchip->core_rst)) {
                if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing core reset property in node\n");
                return PTR_ERR(rockchip->core_rst);
        }
 
-       rockchip->mgmt_rst = devm_reset_control_get(dev, "mgmt");
+       rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt");
        if (IS_ERR(rockchip->mgmt_rst)) {
                if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing mgmt reset property in node\n");
                return PTR_ERR(rockchip->mgmt_rst);
        }
 
-       rockchip->mgmt_sticky_rst = devm_reset_control_get(dev, "mgmt-sticky");
+       rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev,
+                                                                    "mgmt-sticky");
        if (IS_ERR(rockchip->mgmt_sticky_rst)) {
                if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing mgmt-sticky reset property in node\n");
                return PTR_ERR(rockchip->mgmt_sticky_rst);
        }
 
-       rockchip->pipe_rst = devm_reset_control_get(dev, "pipe");
+       rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe");
        if (IS_ERR(rockchip->pipe_rst)) {
                if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing pipe reset property in node\n");
                return PTR_ERR(rockchip->pipe_rst);
        }
 
-       rockchip->pm_rst = devm_reset_control_get(dev, "pm");
+       rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm");
        if (IS_ERR(rockchip->pm_rst)) {
                if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing pm reset property in node\n");
                return PTR_ERR(rockchip->pm_rst);
        }
 
-       rockchip->pclk_rst = devm_reset_control_get(dev, "pclk");
+       rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk");
        if (IS_ERR(rockchip->pclk_rst)) {
                if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing pclk reset property in node\n");
                return PTR_ERR(rockchip->pclk_rst);
        }
 
-       rockchip->aclk_rst = devm_reset_control_get(dev, "aclk");
+       rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk");
        if (IS_ERR(rockchip->aclk_rst)) {
                if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER)
                        dev_err(dev, "missing aclk reset property in node\n");