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 14/19] PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()
Date: Mon, 2 Apr 2007 19:46:46 -0500 (CDT) [thread overview]
Message-ID: <20070403004646.DF2E93A65C@topology.austin.ibm.com> (raw)
In-Reply-To: <20070403002629.GI4922@austin.ibm.com>
Rename rpaphp_register_pci_slot() because its easy to confuse
with rpaphp_register_slot() even though it does something
completely different. Rename it to rpaphp_enable_slot() because
its almost identical to enbale_slot().
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
----
drivers/pci/hotplug/rpaphp.h | 4 +---
drivers/pci/hotplug/rpaphp_core.c | 2 +-
drivers/pci/hotplug/rpaphp_pci.c | 10 +++++++++-
3 files changed, 11 insertions(+), 5 deletions(-)
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp.h
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp.h 2007-04-02 14:34:46.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp.h 2007-04-02 14:40:07.000000000 -0500
@@ -87,13 +87,11 @@ extern struct list_head rpaphp_slot_head
/* function prototypes */
/* rpaphp_pci.c */
-extern int rpaphp_enable_pci_slot(struct slot *slot);
-extern int rpaphp_register_pci_slot(struct slot *slot);
+extern int rpaphp_enable_slot(struct slot *slot);
extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
/* rpaphp_core.c */
extern int rpaphp_add_slot(struct device_node *dn);
-extern int rpaphp_remove_slot(struct slot *slot);
extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
char **drc_name, char **drc_type, int *drc_power_domain);
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_core.c 2007-04-02 14:40:00.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_core.c 2007-04-02 14:40:07.000000000 -0500
@@ -318,7 +318,7 @@ int rpaphp_add_slot(struct device_node *
dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
indexes[i + 1], name, type);
- retval = rpaphp_register_pci_slot(slot);
+ retval = rpaphp_enable_slot(slot);
if (!retval)
retval = rpaphp_register_slot(slot);
Index: linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.21-rc4-git4.orig/drivers/pci/hotplug/rpaphp_pci.c 2007-04-02 14:40:00.000000000 -0500
+++ linux-2.6.21-rc4-git4/drivers/pci/hotplug/rpaphp_pci.c 2007-04-02 14:40:07.000000000 -0500
@@ -77,7 +77,15 @@ static void set_slot_name(struct slot *s
bus->number);
}
-int rpaphp_register_pci_slot(struct slot *slot)
+/**
+ * rpaphp_enable_slot - record slot state, config pci device
+ *
+ * Initialize values in the slot, and the hotplug_slot info
+ * structures to indicate if there is a pci card plugged into
+ * the slot. If the slot is not empty, run the pcibios routine
+ * to get pcibios stuff correctly set up.
+ */
+int rpaphp_enable_slot(struct slot *slot)
{
int rc, level, state;
struct pci_bus *bus;
next prev parent reply other threads:[~2007-04-03 0:46 UTC|newest]
Thread overview: 33+ 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 ` [PATCH 5/19] PCI: rpaphp: Remove un-needed goto Linas Vepstas
2007-04-03 10:49 ` 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 ` Linas Vepstas [this message]
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:28 [PATCH 14/19] PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot() 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=20070403004646.DF2E93A65C@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).