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

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

[PATCH] PCI Hotplug/powerpc: remove duplicated code 



The RPAPHP code contains a routine that duplicates some existing code.
This patch removes the rpaphp version of the code.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Acked-by: default avatarJohn Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 81745512

drivers/pci/hotplug/rpadlpar_core.c

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn) 
	struct pci_controller *phb = pdn->phb;

	struct pci_dev *dev = NULL;



	rpaphp_eeh_init_nodes(dn);

	eeh_add_device_tree_early(dn);



	/* Add EADS device to PHB bus, adding new entry to bus->devices */

	dev = of_create_pci_dev(dn, phb->bus, pdn->devfn);

	if (!dev) {

drivers/pci/hotplug/rpaphp_pci.c

+1 −13
Original line number Diff line number Diff line
@@ -287,18 +287,6 @@ rpaphp_pci_config_slot(struct pci_bus *bus) 
	return dev;

}



void rpaphp_eeh_init_nodes(struct device_node *dn)

{

	struct device_node *sib;



	for (sib = dn->child; sib; sib = sib->sibling) 

		rpaphp_eeh_init_nodes(sib);

	eeh_add_device_early(dn);

	return;

	

}

EXPORT_SYMBOL_GPL(rpaphp_eeh_init_nodes);



static void print_slot_pci_funcs(struct pci_bus *bus)

{

	struct device_node *dn;
@@ -324,7 +312,7 @@ int rpaphp_config_pci_adapter(struct pci_bus *bus) 
	if (!dn)

		goto exit;



	rpaphp_eeh_init_nodes(dn);

	eeh_add_device_tree_early(dn);

	dev = rpaphp_pci_config_slot(bus);

	if (!dev) {

		err("%s: can't find any devices.\n", __FUNCTION__);