Commit 41b70b2c authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Factor out rockchip_pcie_disable_clocks() 



Factor out rockchip_pcie_disable_clocks() so it can be reused by other
functions.

No functional change intended, but it does change the order of unpreparing
clocks in the rockchip_pcie_resume_noirq() error path so it matches the
other paths.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 09df7bc4

drivers/pci/host/pcie-rockchip.c

+14 −16
Original line number Diff line number Diff line
@@ -1417,6 +1417,16 @@ static int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip) 
	return err;

}



static void rockchip_pcie_disable_clocks(void *data)

{

	struct rockchip_pcie *rockchip = data;



	clk_disable_unprepare(rockchip->clk_pcie_pm);

	clk_disable_unprepare(rockchip->hclk_pcie);

	clk_disable_unprepare(rockchip->aclk_perf_pcie);

	clk_disable_unprepare(rockchip->aclk_pcie);

}



static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)

{

	struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
@@ -1440,10 +1450,7 @@ static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev) 
		phy_exit(rockchip->phys[i]);

	}



	clk_disable_unprepare(rockchip->clk_pcie_pm);

	clk_disable_unprepare(rockchip->hclk_pcie);

	clk_disable_unprepare(rockchip->aclk_perf_pcie);

	clk_disable_unprepare(rockchip->aclk_pcie);

	rockchip_pcie_disable_clocks(rockchip);



	if (!IS_ERR(rockchip->vpcie0v9))

		regulator_disable(rockchip->vpcie0v9);
@@ -1483,10 +1490,7 @@ static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev) 
	return 0;



err_pcie_resume:

	clk_disable_unprepare(rockchip->aclk_pcie);

	clk_disable_unprepare(rockchip->aclk_perf_pcie);

	clk_disable_unprepare(rockchip->hclk_pcie);

	clk_disable_unprepare(rockchip->clk_pcie_pm);

	rockchip_pcie_disable_clocks(rockchip);

	return err;

}
@@ -1625,10 +1629,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev) 
	if (!IS_ERR(rockchip->vpcie0v9))

		regulator_disable(rockchip->vpcie0v9);

err_set_vpcie:

	clk_disable_unprepare(rockchip->clk_pcie_pm);

	clk_disable_unprepare(rockchip->hclk_pcie);

	clk_disable_unprepare(rockchip->aclk_perf_pcie);

	clk_disable_unprepare(rockchip->aclk_pcie);

	rockchip_pcie_disable_clocks(rockchip);

	return err;

}
@@ -1650,10 +1651,7 @@ static int rockchip_pcie_remove(struct platform_device *pdev) 
		phy_exit(rockchip->phys[i]);

	}



	clk_disable_unprepare(rockchip->clk_pcie_pm);

	clk_disable_unprepare(rockchip->hclk_pcie);

	clk_disable_unprepare(rockchip->aclk_perf_pcie);

	clk_disable_unprepare(rockchip->aclk_pcie);

	rockchip_pcie_disable_clocks(rockchip);



	if (!IS_ERR(rockchip->vpcie12v))

		regulator_disable(rockchip->vpcie12v);