From 192b8a1bf81c17852b6cf540c95b0a3bcc9c58c4 Mon Sep 17 00:00:00 2001 From: Sherry Sun Date: Fri, 6 Mar 2026 10:12:47 +0800 Subject: [PATCH] PCI: imx6: Change imx_pcie_deassert_core_reset() return type to void The function imx_pcie_deassert_core_reset() always returns 0 and the return value is not used meaningfully by its callers. Change the return type from int to void to simplify the code and remove unnecessary error handling paths. No functional change intended. Signed-off-by: Sherry Sun Signed-off-by: Manivannan Sadhasivam Reviewed-by: Frank Li Reviewed-by: Richard Zhu Link: https://patch.msgid.link/20260306021247.991976-1-sherry.sun@nxp.com --- drivers/pci/controller/dwc/pci-imx6.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 3dfc7bcf53d8..fc652d15a054 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -906,7 +906,7 @@ static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie) gpiod_set_value_cansleep(imx_pcie->reset_gpiod, 1); } -static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) +static void imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) { reset_control_deassert(imx_pcie->pciephy_reset); @@ -920,8 +920,6 @@ static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) /* Wait for 100ms after PERST# deassertion (PCIe r5.0, 6.6.1) */ msleep(100); } - - return 0; } static int imx_pcie_wait_for_speed_change(struct imx_pcie *imx_pcie) @@ -1292,11 +1290,7 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) /* Make sure that PCIe LTSSM is cleared */ imx_pcie_ltssm_disable(dev); - ret = imx_pcie_deassert_core_reset(imx_pcie); - if (ret < 0) { - dev_err(dev, "pcie deassert core reset failed: %d\n", ret); - goto err_phy_off; - } + imx_pcie_deassert_core_reset(imx_pcie); if (imx_pcie->drvdata->wait_pll_lock) { ret = imx_pcie->drvdata->wait_pll_lock(imx_pcie); @@ -1613,9 +1607,7 @@ static int imx_pcie_resume_noirq(struct device *dev) ret = imx_pcie->drvdata->enable_ref_clk(imx_pcie, true); if (ret) return ret; - ret = imx_pcie_deassert_core_reset(imx_pcie); - if (ret) - return ret; + imx_pcie_deassert_core_reset(imx_pcie); /* * Using PCIE_TEST_PD seems to disable MSI and powers down the