Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()

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>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Linas Vepstas and committed by
Greg Kroah-Hartman
fea54b8c 6f79eb74

+11 -5
+1 -3
drivers/pci/hotplug/rpaphp.h
··· 87 87 /* function prototypes */ 88 88 89 89 /* rpaphp_pci.c */ 90 - extern int rpaphp_enable_pci_slot(struct slot *slot); 91 - extern int rpaphp_register_pci_slot(struct slot *slot); 90 + extern int rpaphp_enable_slot(struct slot *slot); 92 91 extern int rpaphp_get_sensor_state(struct slot *slot, int *state); 93 92 94 93 /* rpaphp_core.c */ 95 94 extern int rpaphp_add_slot(struct device_node *dn); 96 - extern int rpaphp_remove_slot(struct slot *slot); 97 95 extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, 98 96 char **drc_name, char **drc_type, int *drc_power_domain); 99 97
+1 -1
drivers/pci/hotplug/rpaphp_core.c
··· 318 318 dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n", 319 319 indexes[i + 1], name, type); 320 320 321 - retval = rpaphp_register_pci_slot(slot); 321 + retval = rpaphp_enable_slot(slot); 322 322 if (!retval) 323 323 retval = rpaphp_register_slot(slot); 324 324
+9 -1
drivers/pci/hotplug/rpaphp_pci.c
··· 77 77 bus->number); 78 78 } 79 79 80 - int rpaphp_register_pci_slot(struct slot *slot) 80 + /** 81 + * rpaphp_enable_slot - record slot state, config pci device 82 + * 83 + * Initialize values in the slot, and the hotplug_slot info 84 + * structures to indicate if there is a pci card plugged into 85 + * the slot. If the slot is not empty, run the pcibios routine 86 + * to get pcibios stuff correctly set up. 87 + */ 88 + int rpaphp_enable_slot(struct slot *slot) 81 89 { 82 90 int rc, level, state; 83 91 struct pci_bus *bus;