From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Jesse Barnes , x86 Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 05/23] PCI: clean up rescan_bus_bridge_resize Date: Mon, 5 Mar 2012 23:13:42 -0800 Message-Id: <1331018040-30725-6-git-send-email-yinghai@kernel.org> In-Reply-To: <1331018040-30725-1-git-send-email-yinghai@kernel.org> References: <1331018040-30725-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: Should only use it with bridge instead of bus. it could get new subordinate. so can not use it with reguar bus. in that case, use may need to make all children devices get removed already. Signed-off-by: Yinghai Lu --- drivers/pci/pci-sysfs.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index d5c8ffb..2049b2f 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -337,7 +337,7 @@ dev_bridge_rescan_store(struct device *dev, struct device_attribute *attr, if (val) { mutex_lock(&pci_remove_rescan_mutex); - pci_rescan_bus(pdev->subordinate); + pci_rescan_bus_bridge_resize(pdev); mutex_unlock(&pci_remove_rescan_mutex); } return count; @@ -387,10 +387,7 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, if (val) { mutex_lock(&pci_remove_rescan_mutex); - if (!pci_is_root_bus(bus) && list_empty(&bus->devices)) - pci_rescan_bus_bridge_resize(bus->self); - else - pci_rescan_bus(bus); + pci_rescan_bus(bus); mutex_unlock(&pci_remove_rescan_mutex); } return count; -- 1.7.7