From deccf139df422052bfcbaba190ea80ddc63e8015 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Fri, 2 Aug 2024 16:12:48 +0800 Subject: [PATCH] PCI: rockchip: dw: Move getting skip_scan_in_resume into rk_pcie_resource_get() Signed-off-by: Shawn Lin Change-Id: I422ad5e53d1a377e7e0b2a11e5144ce54b938be9 --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index 50091161a0dc..ccac9a5f3d0d 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -537,6 +537,10 @@ static int rk_pcie_resource_get(struct platform_device *pdev, dev_info(&pdev->dev, "support hotplug-gpios!\n"); } + /* Skip waiting for training to pass in system PM routine */ + if (device_property_read_bool(&pdev->dev, "rockchip,skip-scan-in-resume")) + rk_pcie->skip_scan_in_resume = true; + retry_regulator: rk_pcie->vpcie3v3 = devm_regulator_get_optional(&pdev->dev, "vpcie3v3"); if (IS_ERR(rk_pcie->vpcie3v3)) { @@ -1275,10 +1279,6 @@ static int rk_pcie_really_probe(void *p) rk_pcie->is_signal_test = true; } - /* Skip waiting for training to pass in system PM routine */ - if (device_property_read_bool(dev, "rockchip,skip-scan-in-resume")) - rk_pcie->skip_scan_in_resume = true; - rk_pcie->hot_rst_wq = create_singlethread_workqueue("rk_pcie_hot_rst_wq"); if (!rk_pcie->hot_rst_wq) { dev_err(dev, "failed to create hot_rst workqueue\n");