diff --git a/[refs] b/[refs] index df227e3a355e..04e230ac5aa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7990681ad8215977b27ac855520720193de2c98f +refs/heads/master: d563e2ccc8adb1385da42e6077736ba6854117bb diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 44f479f08fff..c01bacad9fd9 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -43,19 +43,19 @@ static void pci_destroy_dev(struct pci_dev *dev) pci_dev_put(dev); } -void pci_remove_bus(struct pci_bus *pci_bus) +void pci_remove_bus(struct pci_bus *bus) { - pci_proc_detach_bus(pci_bus); + pci_proc_detach_bus(bus); down_write(&pci_bus_sem); - list_del(&pci_bus->node); - pci_bus_release_busn_res(pci_bus); + list_del(&bus->node); + pci_bus_release_busn_res(bus); up_write(&pci_bus_sem); - if (!pci_bus->is_added) + if (!bus->is_added) return; - pci_remove_legacy_files(pci_bus); - device_unregister(&pci_bus->dev); + pci_remove_legacy_files(bus); + device_unregister(&bus->dev); } EXPORT_SYMBOL(pci_remove_bus);