openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Shawn Lin 2017-08-23 15:02:28 +08:00 committed by Bjorn Helgaas
parent 09df7bc40a
commit 41b70b2c6f
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/pci/host/pcie-rockchip.c
View File

@ -1417,6 +1417,16 @@ static int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip)
return err; 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) static int __maybe_unused rockchip_pcie_suspend_noirq(struct device *dev)
{ {
struct rockchip_pcie *rockchip = dev_get_drvdata(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]); phy_exit(rockchip->phys[i]);
} }
clk_disable_unprepare(rockchip->clk_pcie_pm); rockchip_pcie_disable_clocks(rockchip);
clk_disable_unprepare(rockchip->hclk_pcie);
clk_disable_unprepare(rockchip->aclk_perf_pcie);
clk_disable_unprepare(rockchip->aclk_pcie);
if (!IS_ERR(rockchip->vpcie0v9)) if (!IS_ERR(rockchip->vpcie0v9))
regulator_disable(rockchip->vpcie0v9); regulator_disable(rockchip->vpcie0v9);
@ -1483,10 +1490,7 @@ static int __maybe_unused rockchip_pcie_resume_noirq(struct device *dev)
return 0; return 0;
err_pcie_resume: err_pcie_resume:
clk_disable_unprepare(rockchip->aclk_pcie); rockchip_pcie_disable_clocks(rockchip);
clk_disable_unprepare(rockchip->aclk_perf_pcie);
clk_disable_unprepare(rockchip->hclk_pcie);
clk_disable_unprepare(rockchip->clk_pcie_pm);
return err; return err;
} }
@ -1625,10 +1629,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
if (!IS_ERR(rockchip->vpcie0v9)) if (!IS_ERR(rockchip->vpcie0v9))
regulator_disable(rockchip->vpcie0v9); regulator_disable(rockchip->vpcie0v9);
err_set_vpcie: err_set_vpcie:
clk_disable_unprepare(rockchip->clk_pcie_pm); rockchip_pcie_disable_clocks(rockchip);
clk_disable_unprepare(rockchip->hclk_pcie);
clk_disable_unprepare(rockchip->aclk_perf_pcie);
clk_disable_unprepare(rockchip->aclk_pcie);
return err; return err;
} }
@ -1650,10 +1651,7 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
phy_exit(rockchip->phys[i]); phy_exit(rockchip->phys[i]);
} }
clk_disable_unprepare(rockchip->clk_pcie_pm); rockchip_pcie_disable_clocks(rockchip);
clk_disable_unprepare(rockchip->hclk_pcie);
clk_disable_unprepare(rockchip->aclk_perf_pcie);
clk_disable_unprepare(rockchip->aclk_pcie);
if (!IS_ERR(rockchip->vpcie12v)) if (!IS_ERR(rockchip->vpcie12v))
regulator_disable(rockchip->vpcie12v); regulator_disable(rockchip->vpcie12v);