From kristen.c.accardi@intel.com Fri Apr 13 15:34:19 2007 From: Linas Vepstas Date: Fri, 13 Apr 2007 15:34:11 -0700 Subject: [patch 05/21] PCI: rpaphp: Remove un-needed goto To: gregkh@suse.de Message-ID: <20070413223419.196868685@intel.com> Content-Disposition: inline; filename=pci-rpaphp-remove-un-needed-goto From: Linas Vepstas Remove un-needed goto. Signed-off-by: Linas Vepstas Cc: John Rose Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/rpaphp_slot.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/pci/hotplug/rpaphp_slot.c +++ b/drivers/pci/hotplug/rpaphp_slot.c @@ -157,14 +157,13 @@ int rpaphp_register_slot(struct slot *sl /* should not try to register the same slot twice */ if (is_registered(slot)) { err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name); - retval = -EAGAIN; - goto register_fail; + return -EAGAIN; } retval = pci_hp_register(php_slot); if (retval) { err("pci_hp_register failed with error %d\n", retval); - goto register_fail; + return retval; } /* create "phy_location" file */ @@ -182,7 +181,6 @@ int rpaphp_register_slot(struct slot *sl sysfs_fail: pci_hp_deregister(php_slot); -register_fail: return retval; }