Commit 1e89d268 authored Apr 12, 2013 by Jiang Liu Committed by Bjorn Helgaas Apr 12, 2013

PCI: When removing bus, always remove legacy files & unregister



We always call device_register() and pci_create_legacy_files() for a
new bus before handing out the "struct pci_bus *".  Therefore, there's
no possiblity of removing the bus with pci_remove_bus() before those
calls have been made, so we don't need to check "bus->is_added" before
calling pci_remove_legacy_files() and device_unregister().

[bhelgaas: changelog]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Toshi Kani <toshi.kani@hp.com>

parent f6161aa1

drivers/pci/remove.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -50,9 +50,6 @@ void pci_remove_bus(struct pci_bus *bus)
		list_del(&bus->node);
		pci_bus_release_busn_res(bus);
		up_write(&pci_bus_sem);
		if (!bus->is_added)
		return;

		pci_remove_legacy_files(bus);
		device_unregister(&bus->dev);
		}

Admin message