From: Jiang Liu <liuj97@gmail.com>
Date: Fri, 12 Apr 2013 05:44:15 +0000 (+0000)
Subject: PCI: When removing bus, always remove legacy files & unregister
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e89d268e7a83d8388d4d09d3f2089ced72cc15f;p=linux-beck.git

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

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index cc875e6ed159..a8318801c092 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -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);
 }