Hi Kristen,
> + if (pass)
> + if (dev->subordinate)
> + pci_bus_size_bridges(dev->subordinate);
How about doing as follows. This also satisfies 80 columns rule.
if (pass && dev->subordinate)
pci_bus_size_bridges(dev->subordinate);
Thanks,
Kenji Kaneshige
Kristen Accardi wrote:
> Only size the bus that has been added.
>
> Signed-off-by: Kristen Carlson Accardi <[email protected]>
>
> drivers/pci/hotplug/acpiphp_glue.c | 4 +++-
> drivers/pci/hotplug/acpiphp_glue.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> --- linux-2.6.15-rc5.orig/drivers/pci/hotplug/acpiphp_glue.c
> +++ linux-2.6.15-rc5/drivers/pci/hotplug/acpiphp_glue.c
> @@ -794,12 +794,15 @@ static int enable_device(struct acpiphp_
> if (PCI_SLOT(dev->devfn) != slot->device)
> continue;
> if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
> - dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
> + dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
> max = pci_scan_bridge(bus, dev, max, pass);
> + if (pass)
> + if (dev->subordinate)
> + pci_bus_size_bridges(dev->subordinate);
> + }
> }
> }
>
> - pci_bus_size_bridges(bus);
> pci_bus_assign_resources(bus);
> acpiphp_sanitize_bus(bus);
> pci_enable_bridges(bus);
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
> for problems? Stop! Download the new AJAX search engine that makes
> searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
> _______________________________________________
> Pcihpd-discuss mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/pcihpd-discuss
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]