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

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

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



The function rpaphp_eeh_remove_bus_device() is a dupe of
eeh_remove_bus_device(). Remove it.

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 7fec77e4

drivers/pci/hotplug/rpaphp_pci.c

+1 −19
Original line number Diff line number Diff line
@@ -116,30 +116,12 @@ static void print_slot_pci_funcs(struct pci_bus *bus) 
	return;

}



static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)

{

	eeh_remove_device(dev);

	if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {

		struct pci_bus *bus = dev->subordinate;

		struct list_head *ln;

		if (!bus)

			return; 

		for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {

			struct pci_dev *pdev = pci_dev_b(ln);

			if (pdev)

				rpaphp_eeh_remove_bus_device(pdev);

		}



	}

	return;

}



int rpaphp_unconfig_pci_adapter(struct pci_bus *bus)

{

	struct pci_dev *dev, *tmp;



	list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {

		rpaphp_eeh_remove_bus_device(dev);

		eeh_remove_bus_device(dev);

		pci_remove_bus_device(dev);

	}

	return 0;