On Wed, Feb 29, 2012 at 3:32 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > On Wed, Feb 29, 2012 at 4:07 PM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote: >> Bjorn thought that we should just use that in acpi_root. >> >> Suggested-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> >> --- >> arch/x86/pci/acpi.c | 19 ++++++------------- >> 1 files changed, 6 insertions(+), 13 deletions(-) >> >> diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c >> index ff5243e..5178917 100644 >> --- a/arch/x86/pci/acpi.c >> +++ b/arch/x86/pci/acpi.c >> @@ -12,7 +12,6 @@ struct pci_root_info { >> char name[16]; >> unsigned int res_num; >> struct resource *res; >> - struct resource busn; >> struct pci_sysdata sd; >> }; >> >> @@ -283,9 +282,6 @@ static void add_resources(struct pci_root_info *info, >> int i; >> struct resource *res, *root, *conflict; >> >> - if (info->busn.flags & IORESOURCE_BUS) >> - pci_add_resource(resources, &info->busn); >> - >> coalesce_windows(info, IORESOURCE_MEM); >> coalesce_windows(info, IORESOURCE_IO); >> >> @@ -346,16 +342,12 @@ static void release_pci_root_info(struct pci_host_bridge *bridge) >> >> static void >> probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, >> - int busnum, int busmax, int domain) >> + int busnum, int domain) >> { >> size_t size; >> >> sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum); >> info->bridge = device; >> - info->busn.name = info->name; >> - info->busn.start = busnum; >> - info->busn.end = busmax; >> - info->busn.flags = IORESOURCE_BUS; > > You just *added* this stuff in a prior patch that hasn't been merged > yet. Why can't you just fix that series rather than doing the > add/remove churn? as i said before, I'm not quite sure about the life cycle about that object. still need to wait some months to verify that on system that does support pci root bus hot plug etc. or we can just this patch for now. Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html