diff options
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 4ce83b26ae9e..219a4106480a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -292,8 +292,8 @@ static void assign_requested_resources_sorted(struct list_head *head, | |||
292 | (!(res->flags & IORESOURCE_ROM_ENABLE)))) | 292 | (!(res->flags & IORESOURCE_ROM_ENABLE)))) |
293 | add_to_list(fail_head, | 293 | add_to_list(fail_head, |
294 | dev_res->dev, res, | 294 | dev_res->dev, res, |
295 | 0 /* dont care */, | 295 | 0 /* don't care */, |
296 | 0 /* dont care */); | 296 | 0 /* don't care */); |
297 | } | 297 | } |
298 | reset_resource(res); | 298 | reset_resource(res); |
299 | } | 299 | } |
@@ -667,9 +667,9 @@ static void pci_bridge_check_ranges(struct pci_bus *bus) | |||
667 | if (!io) { | 667 | if (!io) { |
668 | pci_write_config_word(bridge, PCI_IO_BASE, 0xf0f0); | 668 | pci_write_config_word(bridge, PCI_IO_BASE, 0xf0f0); |
669 | pci_read_config_word(bridge, PCI_IO_BASE, &io); | 669 | pci_read_config_word(bridge, PCI_IO_BASE, &io); |
670 | pci_write_config_word(bridge, PCI_IO_BASE, 0x0); | 670 | pci_write_config_word(bridge, PCI_IO_BASE, 0x0); |
671 | } | 671 | } |
672 | if (io) | 672 | if (io) |
673 | b_res[0].flags |= IORESOURCE_IO; | 673 | b_res[0].flags |= IORESOURCE_IO; |
674 | /* DECchip 21050 pass 2 errata: the bridge may miss an address | 674 | /* DECchip 21050 pass 2 errata: the bridge may miss an address |
675 | disconnect boundary by one PCI data phase. | 675 | disconnect boundary by one PCI data phase. |
@@ -819,7 +819,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, | |||
819 | resource_size_t min_align, align; | 819 | resource_size_t min_align, align; |
820 | 820 | ||
821 | if (!b_res) | 821 | if (!b_res) |
822 | return; | 822 | return; |
823 | 823 | ||
824 | min_align = window_alignment(bus, IORESOURCE_IO); | 824 | min_align = window_alignment(bus, IORESOURCE_IO); |
825 | list_for_each_entry(dev, &bus->devices, bus_list) { | 825 | list_for_each_entry(dev, &bus->devices, bus_list) { |
@@ -950,7 +950,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, | |||
950 | if (realloc_head && i >= PCI_IOV_RESOURCES && | 950 | if (realloc_head && i >= PCI_IOV_RESOURCES && |
951 | i <= PCI_IOV_RESOURCE_END) { | 951 | i <= PCI_IOV_RESOURCE_END) { |
952 | r->end = r->start - 1; | 952 | r->end = r->start - 1; |
953 | add_to_list(realloc_head, dev, r, r_size, 0/* dont' care */); | 953 | add_to_list(realloc_head, dev, r, r_size, 0/* don't care */); |
954 | children_add_size += r_size; | 954 | children_add_size += r_size; |
955 | continue; | 955 | continue; |
956 | } | 956 | } |
@@ -1456,8 +1456,8 @@ static enum enable_type pci_realloc_detect(struct pci_bus *bus, | |||
1456 | 1456 | ||
1457 | /* | 1457 | /* |
1458 | * first try will not touch pci bridge res | 1458 | * first try will not touch pci bridge res |
1459 | * second and later try will clear small leaf bridge res | 1459 | * second and later try will clear small leaf bridge res |
1460 | * will stop till to the max deepth if can not find good one | 1460 | * will stop till to the max depth if can not find good one |
1461 | */ | 1461 | */ |
1462 | void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus) | 1462 | void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus) |
1463 | { | 1463 | { |