Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea54b8c authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman
Browse files

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: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6f79eb74

drivers/pci/hotplug/rpaphp.h

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/pci/hotplug/rpaphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int rpaphp_add_slot(struct device_node *dn) 
		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);

drivers/pci/hotplug/rpaphp_pci.c

+9 −1
Original line number Diff line number Diff line
@@ -77,7 +77,15 @@ static void set_slot_name(struct slot *slot) 
			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;