linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: linas@austin.ibm.com (Linas Vepstas)
To: Greg KH <gregkh@suse.de>
Cc: Andrew Morton <akpm@osdl.org>,
	linuxppc-dev@ozlabs.org, linux-pci@atrey.karlin.mff.cuni.cz
Subject: [PATCH 5/19] PCI: rpaphp: Remove un-needed goto
Date: Mon,  2 Apr 2007 19:37:46 -0500 (CDT)	[thread overview]
Message-ID: <20070403003746.6E9853A65C@topology.austin.ibm.com> (raw)
In-Reply-To: <20070403002629.GI4922@austin.ibm.com>


Remove un-needed goto.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>

----
 drivers/pci/hotplug/rpaphp_slot.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_slot.c	2007-03-28 18:07:28.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_slot.c	2007-03-28 18:10:14.000000000 -0500
@@ -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;
 }
 

  parent reply	other threads:[~2007-04-03  0:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-03  0:26 [PATCH 0/19]: RPAPHP pci hotplug cleanup patchbomb Linas Vepstas
2007-04-03  0:33 ` [PATCH 1/19] PCI: rpaphp: Cleanup flow of control for rpaphp_add_slot Linas Vepstas
2007-04-03 14:28   ` Nathan Lynch
2007-04-03 16:00     ` Linas Vepstas
2007-04-03  0:34 ` [PATCH 2/19] PCI: rpaphp: Remove global num_slots variable Linas Vepstas
2007-04-03  0:35 ` [PATCH 3/19] PCI: rpaphp: match up alloc and free in same routine Linas Vepstas
2007-04-03  0:36 ` [PATCH 4/19] PCI: rpaphp: Fix a memleak; slot->location string was never freed Linas Vepstas
2007-04-03  0:37 ` Linas Vepstas [this message]
2007-04-03 10:49   ` [PATCH 5/19] PCI: rpaphp: Remove un-needed goto Christoph Hellwig
2007-04-03 15:59     ` Linas Vepstas
2007-04-03  0:38 ` [PATCH 6/19] PCI: rpaphp: remove a function that does nothing but wrap debug printk's Linas Vepstas
2007-04-03  0:39 ` [PATCH 7/19] PCI: rpaphp: Remve another call that is a wrapper Linas Vepstas
2007-04-03  0:40 ` [PATCH 8/19] PCI: rpaphp: Remove another wrappered function Linas Vepstas
2007-04-03  0:41 ` [PATCH 9/19] PCI: rpaphp: remove a call that does nothing but a pointer lookup Linas Vepstas
2007-04-03  0:42 ` [PATCH 10/19] PCI: rpaphp: Remove setup_pci_slot() Linas Vepstas
2007-04-03  0:43 ` [PATCH 11/19] PCI: rpaphp: remove print_slot_pci_funcs() Linas Vepstas
2007-04-03  0:44 ` [PATCH 12/19] PCI: rpaphp: remove rpaphp_set_attention_status() Linas Vepstas
2007-04-03 16:19   ` Nathan Lynch
2007-04-03 16:45     ` Linas Vepstas
2007-04-03  0:45 ` [PATCH 13/19] PCI: rpaphp: refactor tail call to rpaphp_register_slot() Linas Vepstas
2007-04-03  0:46 ` [PATCH 14/19] PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot() Linas Vepstas
2007-04-03  0:47 ` [PATCH 15/19] PCI: rpaphp: Document find_php_slot() Linas Vepstas
2007-04-03  0:48 ` [PATCH 16/19] PCI: rpaphp: Document is_php_dn() Linas Vepstas
2007-04-03  0:49 ` [PATCH 17/19] PCI: rpaphp: Use pcibios_remove_pci_devices() symmetrically Linas Vepstas
2007-04-03  0:50 ` [PATCH 18/19] PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry Linas Vepstas
2007-04-03  0:51 ` [PATCH 19/19] PCI: rpaphp: Remove semaphores Linas Vepstas
2007-04-03  4:15 ` [PATCH 0/19]: RPAPHP pci hotplug cleanup patchbomb Greg KH
2007-04-03 16:18   ` Linas Vepstas
2007-04-03 16:34 ` Linas Vepstas
2007-04-03 16:48   ` Linas Vepstas
2007-04-05 15:33   ` Kristen Carlson Accardi
2007-04-05 22:41     ` Linas Vepstas
  -- strict thread matches above, loose matches on Subject: below --
2007-04-03 17:09 [PATCH 5/19] PCI: rpaphp: Remove un-needed goto Linas Vepstas
2007-04-03 17:19 Linas Vepstas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070403003746.6E9853A65C@topology.austin.ibm.com \
    --to=linas@austin.ibm.com \
    --cc=akpm@osdl.org \
    --cc=gregkh@suse.de \
    --cc=linux-pci@atrey.karlin.mff.cuni.cz \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).