aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-23 00:38:57 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-05-22 17:38:47 -0500
commit2af31f415fa177dd11bc76f2a292b09330803c89 (patch)
tree37977a75d0f4f6a5900507da37827137fce48582 /drivers/pci/hotplug
parentPCI: pciehp: Drop pointless ACPI-based "slot detection" check (diff)
downloadlinux-dev-2af31f415fa177dd11bc76f2a292b09330803c89.tar.xz
linux-dev-2af31f415fa177dd11bc76f2a292b09330803c89.zip
PCI: pciehp: Drop pointless label from pciehp_probe()
The err_out_none label in pciehp_probe() only leads to a return statement, so use return statements instead of jumps to it and drop it. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/pciehp_core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 5e052981f1c1..4597f6bd1958 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -256,13 +256,13 @@ static int pciehp_probe(struct pcie_device *dev)
/* Can happen if we run out of bus numbers during probe */
dev_err(&dev->device,
"Hotplug bridge without secondary bus, ignoring\n");
- goto err_out_none;
+ return -ENODEV;
}
ctrl = pcie_init(dev);
if (!ctrl) {
dev_err(&dev->device, "Controller initialization failed\n");
- goto err_out_none;
+ return -ENODEV;
}
set_service_data(dev, ctrl);
@@ -302,7 +302,6 @@ err_out_free_ctrl_slot:
cleanup_slot(ctrl);
err_out_release_ctlr:
pciehp_release_ctrl(ctrl);
-err_out_none:
return -ENODEV;
}