| Message ID | 1385429290-25397-2-git-send-email-yinghai@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Monday, November 25, 2013 05:28:01 PM Yinghai Lu wrote: > To be consistent with change in > | PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev() > > Use device_release_driver for root bus/hostbridge. > > Also use device_unregister() in pci_remove_root_bus() instead of > device_del/put_device, that will be corresponding device_register() > for pci_create_root_bus for hostbridge. > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/pci/remove.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c > index cc9337a..692f4c3 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); > } >
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index cc9337a..692f4c3 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); }
To be consistent with change in | PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev() Use device_release_driver for root bus/hostbridge. Also use device_unregister() in pci_remove_root_bus() instead of device_del/put_device, that will be corresponding device_register() for pci_create_root_bus for hostbridge. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/remove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)