Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 116a489d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: designware: Simplify control flow 



Return values immediately when possible to simplify the control flow.

No functional change intended.  Folded in unused variable removal as
pointed out by Fabio Estevam <fabio.estevam@nxp.com>, Arnd Bergmann
<arnd@arndb.de>, and Thierry Reding <thierry.reding@gmail.com>.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarPratyush Anand <pratyush.anand@gmail.com>
parent 1ec21837

drivers/pci/host/pcie-designware.c

+18 −36
Original line number Diff line number Diff line
@@ -128,27 +128,19 @@ static inline void dw_pcie_writel_rc(struct pcie_port *pp, u32 val, u32 reg) 
static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,

			       u32 *val)

{

	int ret;



	if (pp->ops->rd_own_conf)

		ret = pp->ops->rd_own_conf(pp, where, size, val);

	else

		ret = dw_pcie_cfg_read(pp->dbi_base + where, size, val);

		return pp->ops->rd_own_conf(pp, where, size, val);



	return ret;

	return dw_pcie_cfg_read(pp->dbi_base + where, size, val);

}



static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,

			       u32 val)

{

	int ret;



	if (pp->ops->wr_own_conf)

		ret = pp->ops->wr_own_conf(pp, where, size, val);

	else

		ret = dw_pcie_cfg_write(pp->dbi_base + where, size, val);

		return pp->ops->wr_own_conf(pp, where, size, val);



	return ret;

	return dw_pcie_cfg_write(pp->dbi_base + where, size, val);

}



static void dw_pcie_prog_outbound_atu(struct pcie_port *pp, int index,
@@ -384,7 +376,7 @@ int dw_pcie_link_up(struct pcie_port *pp) 
{

	if (pp->ops->link_up)

		return pp->ops->link_up(pp);

	else



	return 0;

}
@@ -659,46 +651,36 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, 
			int size, u32 *val)

{

	struct pcie_port *pp = bus->sysdata;

	int ret;



	if (dw_pcie_valid_config(pp, bus, PCI_SLOT(devfn)) == 0) {

		*val = 0xffffffff;

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	if (bus->number != pp->root_bus_nr)

	if (bus->number == pp->root_bus_nr)

		return dw_pcie_rd_own_conf(pp, where, size, val);



	if (pp->ops->rd_other_conf)

			ret = pp->ops->rd_other_conf(pp, bus, devfn,

						where, size, val);

		else

			ret = dw_pcie_rd_other_conf(pp, bus, devfn,

						where, size, val);

	else

		ret = dw_pcie_rd_own_conf(pp, where, size, val);

		return pp->ops->rd_other_conf(pp, bus, devfn, where, size, val);



	return ret;

	return dw_pcie_rd_other_conf(pp, bus, devfn, where, size, val);

}



static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn,

			int where, int size, u32 val)

{

	struct pcie_port *pp = bus->sysdata;

	int ret;



	if (dw_pcie_valid_config(pp, bus, PCI_SLOT(devfn)) == 0)

		return PCIBIOS_DEVICE_NOT_FOUND;



	if (bus->number != pp->root_bus_nr)

	if (bus->number == pp->root_bus_nr)

		return dw_pcie_wr_own_conf(pp, where, size, val);



	if (pp->ops->wr_other_conf)

			ret = pp->ops->wr_other_conf(pp, bus, devfn,

						where, size, val);

		else

			ret = dw_pcie_wr_other_conf(pp, bus, devfn,

						where, size, val);

	else

		ret = dw_pcie_wr_own_conf(pp, where, size, val);

		return pp->ops->wr_other_conf(pp, bus, devfn, where, size, val);



	return ret;

	return dw_pcie_wr_other_conf(pp, bus, devfn, where, size, val);

}



static struct pci_ops dw_pcie_ops = {