PCI: imx6: Simplify a trivial if-return sequence (8d1ceb52) · Commits · 戴 / test

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>

drivers/pci/host/pci-imx6.c

+2 −10

Original line number	Diff line number	Diff line
		@@ -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)

Admin message