aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2007-04-13 18:34:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-02 22:02:39 -0400
commit3499f0726ec179afd19669070681ac457d27033f (patch)
tree5a7f84dea65852d448074708a654a83fbee4838c /drivers/pci
parent5fd39c35a016150e93b68c472a04b2d4b5574a2b (diff)
PCI: rpaphp: Remove un-needed goto
Remove un-needed goto. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: John Rose <johnrose@austin.ibm.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/rpaphp_slot.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 865b0b7ef20c..9b9400727985 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -157,14 +157,13 @@ int rpaphp_register_slot(struct slot *slot)
157 /* should not try to register the same slot twice */ 157 /* should not try to register the same slot twice */
158 if (is_registered(slot)) { 158 if (is_registered(slot)) {
159 err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name); 159 err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
160 retval = -EAGAIN; 160 return -EAGAIN;
161 goto register_fail;
162 } 161 }
163 162
164 retval = pci_hp_register(php_slot); 163 retval = pci_hp_register(php_slot);
165 if (retval) { 164 if (retval) {
166 err("pci_hp_register failed with error %d\n", retval); 165 err("pci_hp_register failed with error %d\n", retval);
167 goto register_fail; 166 return retval;
168 } 167 }
169 168
170 /* create "phy_location" file */ 169 /* create "phy_location" file */
@@ -182,7 +181,6 @@ int rpaphp_register_slot(struct slot *slot)
182 181
183sysfs_fail: 182sysfs_fail:
184 pci_hp_deregister(php_slot); 183 pci_hp_deregister(php_slot);
185register_fail:
186 return retval; 184 return retval;
187} 185}
188 186