diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:44 -0700 |
---|---|---|
committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:44 -0700 |
commit | 277df390baeab7ba6aa136356b677a096c890c0c (patch) | |
tree | 33b35ec0cef3cf64890ed4512a37bf0c8aeda930 | |
parent | 14462649a2dff2ee5571800d327501b2361e7b03 (diff) | |
download | linux-yinghai-277df390baeab7ba6aa136356b677a096c890c0c.tar.gz |
PCI: Rescan bus using callback method too
Just like removal.
Because We could add new bus under the bridges...
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r-- | drivers/pci/pci-sysfs.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 02d107b152818e..60e04b227763bb 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -356,24 +356,34 @@ remove_store(struct device *dev, struct device_attribute *dummy, return count; } +static void bus_rescan_callback(struct device *dev) +{ + struct pci_bus *bus = to_pci_bus(dev); + + 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); + mutex_unlock(&pci_remove_rescan_mutex); +} + static ssize_t dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + int ret = 0; unsigned long val; - struct pci_bus *bus = to_pci_bus(dev); if (strict_strtoul(buf, 0, &val) < 0) return -EINVAL; - 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); - mutex_unlock(&pci_remove_rescan_mutex); - } + if (val) + ret = device_schedule_callback(dev, bus_rescan_callback); + + if (ret) + count = ret; + return count; } |