PCI: imx6: Simplify a trivial if-return sequence

Simplify a trivial if-return sequence by combining it with a preceding
function call.

The semantic patch that makes this change is available in
scripts/coccinelle/misc/simple_return.cocci.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Lucas Stach <l.stach@pengutronix.de>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 233a196c6e66..8f3a9813c4e5 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -117,11 +117,7 @@ static int pcie_phy_wait_ack(void __iomem *dbi_base, int addr)
         val = addr << PCIE_PHY_CTRL_DATA_LOC;
         writel(val, dbi_base + PCIE_PHY_CTRL);
 
-        ret = pcie_phy_poll_ack(dbi_base, 0);
-        if (ret)
-                return ret;
-
-        return 0;
+        return pcie_phy_poll_ack(dbi_base, 0);
 }
 
 /* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */
@@ -148,11 +144,7 @@ static int pcie_phy_read(void __iomem *dbi_base, int addr , int *data)
         /* deassert Read signal */
         writel(0x00, dbi_base + PCIE_PHY_CTRL);
 
-        ret = pcie_phy_poll_ack(dbi_base, 0);
-        if (ret)
-                return ret;
-
-        return 0;
+        return pcie_phy_poll_ack(dbi_base, 0);
 }
 
 static int pcie_phy_write(void __iomem *dbi_base, int addr, int data)