diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-11-30 23:40:27 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-18 21:53:36 +0100 |
| commit | e3b439e1d315aff59c1b4f0fc43c5cd2d82b4138 (patch) | |
| tree | 485ec3ecc6cf1a79a368c446cbe86fe86cf853b7 /drivers/pci/remove.c | |
| parent | PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev() (diff) | |
| download | linux-e3b439e1d315aff59c1b4f0fc43c5cd2d82b4138.tar.xz linux-e3b439e1d315aff59c1b4f0fc43c5cd2d82b4138.zip | |
PCI: Use device_release_driver() in pci_stop_root_bus()
To be consistent with 4bff6749905d ("PCI: Move device_del() from
pci_stop_dev() to pci_destroy_dev()", this changes pci_stop_root_bus()
to use device_release_driver() instead of device_del().
This also changes pci_remove_root_bus() to use device_unregister()
instead of put_device() so it corresponds with the device_register()
call in pci_create_root_bus().
[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/remove.c')
| -rw-r--r-- | drivers/pci/remove.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index cc9337a71529..692f4c39ac48 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -128,7 +128,7 @@ void pci_stop_root_bus(struct pci_bus *bus) pci_stop_bus_device(child); /* stop the host bridge */ - device_del(&host_bridge->dev); + device_release_driver(&host_bridge->dev); } void pci_remove_root_bus(struct pci_bus *bus) @@ -147,5 +147,5 @@ void pci_remove_root_bus(struct pci_bus *bus) host_bridge->bus = NULL; /* remove the host bridge */ - put_device(&host_bridge->dev); + device_unregister(&host_bridge->dev); } |