Messages in this thread | | | From | Bjorn Helgaas <> | Date | Mon, 12 Mar 2012 21:11:55 -0600 | Subject | Re: [PATCH v2 21/37] PCI, ACPI: Make acpi_pci_root_remove remove pci root bus too |
| |
On Sat, Mar 10, 2012 at 12:00 AM, Yinghai Lu <yinghai@kernel.org> wrote: > It will call new added pci_stop_and_remove_bus() to stop/remove pci root bus. > > Also checking if that pci_root_bus get removed already in bus remove in /sys > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > Cc: Len Brown <lenb@kernel.org> > Cc: linux-acpi@vger.kernel.org > --- > drivers/acpi/pci_root.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index 7aff631..b38e347 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -643,10 +643,24 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) > { > struct acpi_pci_root *root = acpi_driver_data(device); > > + /* that root bus could be removed already */ > + if (!pci_find_bus(root->segment, root->secondary.start)) { > + dev_printk(KERN_DEBUG, &device->dev, > + "freeing acpi_pci_root, but pci root bus was removed before"); > + goto out;
I don't think we should handle the root bus separately from the host bridge, as I mentioned before. If we handle them together, checks like this won't be needed.
> + } > + > device_set_run_wake(root->bus->bridge, false); > pci_acpi_remove_bus_pm_notifier(device); > > + dev_printk(KERN_DEBUG, &device->dev, > + "freeing acpi_pci_root, will remove pci root bus at first"); > + pci_stop_and_remove_bus(root->bus); > + > +out: > + list_del(&root->node); > kfree(root); > + > return 0; > } > > -- > 1.7.7 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |