Skip to contentSkip to conversation

PCI: imx6: Return the function value directly

PATCH New Fabio Estevam 1 participant 1 message Jun 2, 2015

Subsystems (2)
Arm i.MX and Layerscape PCI
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 PCI: imx6: Return the function value directly

From: Fabio Estevam <[email protected]>

Simplify a trivial if-return sequence by returning the function value directly.

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

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/pci/host/pci-imx6.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/pci/host/pci-imx6.c +2 -10
index fdb9536..f28f00d 100644
@@ -115,11 +115,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) */

@@ -146,11 +142,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)
Signature · 1 line
1.9.1