Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/controller/dw-rockchip' 

- Use devm_regulator_get_enable_optional() to simplify probing (Anand Moon)

* pci/controller/dw-rockchip:
  PCI: dw-rockchip: Simplify regulator setup with devm_regulator_get_enable_optional()
This commit is contained in:
Bjorn Helgaas 2025-12-03 14:18:36 -06:00
parent 2b12e31cb3 c930b10f17
commit dddd6122d0
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/pci/controller/dwc/pcie-dw-rockchip.c
View File

@ -88,7 +88,6 @@ struct rockchip_pcie {
unsigned int clk_cnt; unsigned int clk_cnt;
struct reset_control *rst; struct reset_control *rst;
struct gpio_desc *rst_gpio; struct gpio_desc *rst_gpio;
struct regulator *vpcie3v3;
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
const struct rockchip_pcie_of_data *data; const struct rockchip_pcie_of_data *data;
bool supports_clkreq; bool supports_clkreq;
@ -692,22 +691,15 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
return ret; return ret;
/* DON'T MOVE ME: must be enable before PHY init */ /* DON'T MOVE ME: must be enable before PHY init */
rockchip->vpcie3v3 = devm_regulator_get_optional(dev, "vpcie3v3"); ret = devm_regulator_get_enable_optional(dev, "vpcie3v3");
if (IS_ERR(rockchip->vpcie3v3)) { if (ret < 0 && ret != -ENODEV)
if (PTR_ERR(rockchip->vpcie3v3) != -ENODEV) return dev_err_probe(dev, ret,
return dev_err_probe(dev, PTR_ERR(rockchip->vpcie3v3), "failed to enable vpcie3v3 regulator\n");
"failed to get vpcie3v3 regulator\n");
rockchip->vpcie3v3 = NULL;
} else {
ret = regulator_enable(rockchip->vpcie3v3);
if (ret)
return dev_err_probe(dev, ret,
"failed to enable vpcie3v3 regulator\n");
}
ret = rockchip_pcie_phy_init(rockchip); ret = rockchip_pcie_phy_init(rockchip);
if (ret) if (ret)
goto disable_regulator; return dev_err_probe(dev, ret,
"failed to initialize the phy\n");
ret = reset_control_deassert(rockchip->rst); ret = reset_control_deassert(rockchip->rst);
if (ret) if (ret)
@ -740,9 +732,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
clk_bulk_disable_unprepare(rockchip->clk_cnt, rockchip->clks); clk_bulk_disable_unprepare(rockchip->clk_cnt, rockchip->clks);
deinit_phy: deinit_phy:
rockchip_pcie_phy_deinit(rockchip); rockchip_pcie_phy_deinit(rockchip);
disable_regulator:
if (rockchip->vpcie3v3)
regulator_disable(rockchip->vpcie3v3);
return ret; return ret;
} }