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

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

[PATCH] powerpc/PCI hotplug: remove rpaphp_find_bus() 



The function rpaphp_find_pci_bus() has been migrated to
pcibios_find_pci_bus() in arch/powerpc/platforms/pseries/pci_dlpar.c
This patch removes the old version.

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 53044f35

drivers/pci/hotplug/rpadlpar_core.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn) 
{

	struct pci_dev *dev;



	if (rpaphp_find_pci_bus(dn))

	if (pcibios_find_pci_bus(dn))

		return -EINVAL;



	/* Add pci bus */
@@ -221,7 +221,7 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn) 
	struct pci_dn *pdn;

	int rc = 0;



	if (!rpaphp_find_pci_bus(dn))

	if (!pcibios_find_pci_bus(dn))

		return -EINVAL;



	slot = find_slot(dn);
@@ -366,7 +366,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn) 
	struct pci_bus *bus;

	struct slot *slot;



	bus = rpaphp_find_pci_bus(dn);

	bus = pcibios_find_pci_bus(dn);

	if (!bus)

		return -EINVAL;

drivers/pci/hotplug/rpaphp.h

+0 −3
Original line number Diff line number Diff line
@@ -88,13 +88,10 @@ extern int num_slots; 
/* function prototypes */



/* rpaphp_pci.c */

extern struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn);

extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);

extern int rpaphp_enable_pci_slot(struct slot *slot);

extern int register_pci_slot(struct slot *slot);

extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);

extern void rpaphp_init_new_devs(struct pci_bus *bus);

extern void rpaphp_eeh_init_nodes(struct device_node *dn);



extern int rpaphp_config_pci_adapter(struct pci_bus *bus);

extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);

drivers/pci/hotplug/rpaphp_pci.c

+2 −32
Original line number Diff line number Diff line
@@ -32,36 +32,6 @@ 
#include "../pci.h"		/* for pci_add_new_bus */

#include "rpaphp.h"



static struct pci_bus *find_bus_among_children(struct pci_bus *bus,

					struct device_node *dn)

{

	struct pci_bus *child = NULL;

	struct list_head *tmp;

	struct device_node *busdn;



	busdn = pci_bus_to_OF_node(bus);

	if (busdn == dn)

		return bus;



	list_for_each(tmp, &bus->children) {

		child = find_bus_among_children(pci_bus_b(tmp), dn);

		if (child)

			break;

	}

	return child;

}



struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)

{

	struct pci_dn *pdn = dn->data;



	if (!pdn  || !pdn->phb || !pdn->phb->bus)

		return NULL;



	return find_bus_among_children(pdn->phb->bus, dn);

}

EXPORT_SYMBOL_GPL(rpaphp_find_pci_bus);



static int rpaphp_get_sensor_state(struct slot *slot, int *state)

{

	int rc;
@@ -120,7 +90,7 @@ int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value) 
			/* config/unconfig adapter */

			*value = slot->state;

		} else {

			bus = rpaphp_find_pci_bus(slot->dn);

			bus = pcibios_find_pci_bus(slot->dn);

			if (bus && !list_empty(&bus->devices))

				*value = CONFIGURED;

			else
@@ -370,7 +340,7 @@ static int setup_pci_slot(struct slot *slot) 
	struct pci_bus *bus;



	BUG_ON(!dn);

	bus = rpaphp_find_pci_bus(dn);

	bus = pcibios_find_pci_bus(dn);

	if (!bus) {

		err("%s: no pci_bus for dn %s\n", __FUNCTION__, dn->full_name);

		goto exit_rc;