From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 22 May 2015 22:38:57 +0000 (+0200)
Subject: PCI: pciehp: Drop pointless label from pciehp_probe()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2af31f415fa177dd11bc76f2a292b09330803c89;p=linux-beck.git

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>
---

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;
 }