diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-12 21:07:04 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-19 16:17:22 +0100 |
| commit | 9e808eb6a7689b61399f772a2576d779161769ec (patch) | |
| tree | 73af8c5605ba91394b1fffdc964a03741b4897c4 /arch/arm/mach-mv78xx0 | |
| parent | sparc/PCI: Claim bus resources before pci_bus_add_devices() (diff) | |
| download | linux-9e808eb6a7689b61399f772a2576d779161769ec.tar.xz linux-9e808eb6a7689b61399f772a2576d779161769ec.zip | |
PCI: Cleanup control flow
Return errors immediately so the straightline path is the normal,
no-error path. No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
| -rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 445e553f4a28..097ea4cb1136 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -197,17 +197,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); static struct pci_bus __init * mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys) { - struct pci_bus *bus; - - if (nr < num_pcie_ports) { - bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, - &sys->resources); - } else { - bus = NULL; + if (nr >= num_pcie_ports) { BUG(); + return NULL; } - return bus; + return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, + &sys->resources); } static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot, |