From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Jiang Liu To: Bjorn Helgaas , "Rafael J . Wysocki" Cc: Jiang Liu , Yinghai Lu , Yijing Wang , Jiang Liu , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Greg Kroah-Hartman , ACPI Devel Maling List , Toshi Kani , Myron Stowe , "Rafael J. Wysocki" Subject: [PATCH v8 01/13] PCI: do not check is_added flag in pci_remove_bus() Date: Tue, 26 Feb 2013 23:25:41 +0800 Message-Id: <1361892353-14786-2-git-send-email-jiang.liu@huawei.com> In-Reply-To: <1361892353-14786-1-git-send-email-jiang.liu@huawei.com> References: <1361892353-14786-1-git-send-email-jiang.liu@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: The is_added flag in struct pci_bus is always set after invoking device_register() and pci_create_legacy_files(). The related code paths are: 1) pci_create_root_bus() and pci_add_new_bus() bus = pci_alloc_bus() device_register(&bus->dev) pci_create_legacy_file(bus) 2.a) pci_scan_child_bus(bus) set is_added flag for PCI root buses 2.b) pci_bus_add_devices(bus) set is_added flag for normal PCI buses So pci_remove_bus() shouldn't use is_added flag to guard invoking of pci_remove_lagecy_files() and device_unregister(). One more step further, now bus->is_added is only used to guard invoking of pcibios_fixup_bus(), so cleaup the code. Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang Cc: Yinghai Lu Cc: "Rafael J. Wysocki" Cc: Toshi Kani Cc: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/pci/bus.c | 11 ++--------- drivers/pci/probe.c | 3 +-- drivers/pci/remove.c | 3 --- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 8647dc6..bdc1e8b 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -206,16 +206,9 @@ void pci_bus_add_devices(const struct pci_bus *bus) list_for_each_entry(dev, &bus->devices, bus_list) { BUG_ON(!dev->is_added); - child = dev->subordinate; - - if (!child) - continue; - pci_bus_add_devices(child); - - if (child->is_added) - continue; - child->is_added = 1; + if (child) + pci_bus_add_devices(child); } } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b494066..45c93b3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1627,8 +1627,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) if (!bus->is_added) { dev_dbg(&bus->dev, "fixups for bus\n"); pcibios_fixup_bus(bus); - if (pci_is_root_bus(bus)) - bus->is_added = 1; + bus->is_added = 1; } for (pass=0; pass < 2; pass++) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index fc38c48..66967e5 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -48,9 +48,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); } -- 1.7.9.5