From 27ea9a22f61aea20b5cd65d31945496d6993e518 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sun, 16 Dec 2018 21:19:03 -0800 Subject: PCI: imx6: Remove unused return values Port of a Linux commit 9ab021b6cf8b5bfc40ea9333c9b64b554fe01cd4 Remove unused return values. No functional change intended. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- drivers/pci/pci-imx6.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers') diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c index 8e7bae2587..fa62aa3a46 100644 --- a/drivers/pci/pci-imx6.c +++ b/drivers/pci/pci-imx6.c @@ -236,7 +236,7 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie) pcie_phy_write(imx6_pcie, PHY_RX_OVRD_IN_LO, temp); } -static int imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) +static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) { struct pcie_port *pp = &imx6_pcie->pp; u32 val, gpr1, gpr12; @@ -283,11 +283,9 @@ static int imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) writel(gpr1, imx6_pcie->iomuxc_gpr + IOMUXC_GPR1); break; } - - return 0; } -static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) +static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) { struct device_d *dev = imx6_pcie->pp.dev; int ret; @@ -296,7 +294,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) ret = clk_enable(imx6_pcie->pcie_phy); if (ret) { dev_err(dev, "unable to enable pcie_phy clock\n"); - goto err_pcie_phy; + return; } ret = clk_enable(imx6_pcie->pcie_bus); @@ -351,15 +349,12 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) break; } - return 0; + return; err_pcie: clk_disable(imx6_pcie->pcie_bus); err_pcie_bus: clk_disable(imx6_pcie->pcie_phy); -err_pcie_phy: - return ret; - } static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) -- cgit v1.2.3