diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-05-17 21:51:11 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 17:42:22 -0400 |
commit | b918c62e086b2130a7bae44110ca516ef10bfe5a (patch) | |
tree | e4aee0e76da9a6ddd2d787de63f4ae7ad4d10e59 /drivers/pci | |
parent | 92f02430934ca1c1e991a1ab3541880575042697 (diff) |
PCI: replace struct pci_bus secondary/subordinate with busn_res
Replace the struct pci_bus secondary/subordinate members with the
struct resource busn_res. Later we'll build a resource tree of these
bus numbers.
[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 8 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpci_hotplug_pci.c | 6 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_pci.c | 6 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_sysfs.c | 6 | ||||
-rw-r--r-- | drivers/pci/iov.c | 4 | ||||
-rw-r--r-- | drivers/pci/pci.c | 2 | ||||
-rw-r--r-- | drivers/pci/probe.c | 58 | ||||
-rw-r--r-- | drivers/pci/setup-bus.c | 24 |
9 files changed, 59 insertions, 59 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 806c44fa645a..62d0ae4dfcad 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -100,11 +100,11 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, | |||
100 | PCI_PRIMARY_BUS, | 100 | PCI_PRIMARY_BUS, |
101 | &buses); | 101 | &buses); |
102 | 102 | ||
103 | if (((buses >> 8) & 0xff) != bus->secondary) { | 103 | if (((buses >> 8) & 0xff) != bus->busn_res.start) { |
104 | buses = (buses & 0xff000000) | 104 | buses = (buses & 0xff000000) |
105 | | ((unsigned int)(bus->primary) << 0) | 105 | | ((unsigned int)(bus->primary) << 0) |
106 | | ((unsigned int)(bus->secondary) << 8) | 106 | | ((unsigned int)(bus->busn_res.start) << 8) |
107 | | ((unsigned int)(bus->subordinate) << 16); | 107 | | ((unsigned int)(bus->busn_res.end) << 16); |
108 | pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses); | 108 | pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses); |
109 | } | 109 | } |
110 | return NOTIFY_OK; | 110 | return NOTIFY_OK; |
@@ -692,7 +692,7 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus) | |||
692 | * bus->subordinate value because it could have | 692 | * bus->subordinate value because it could have |
693 | * padding in it. | 693 | * padding in it. |
694 | */ | 694 | */ |
695 | max = bus->secondary; | 695 | max = bus->busn_res.start; |
696 | 696 | ||
697 | list_for_each(tmp, &bus->children) { | 697 | list_for_each(tmp, &bus->children) { |
698 | n = pci_bus_max_busnr(pci_bus_b(tmp)); | 698 | n = pci_bus_max_busnr(pci_bus_b(tmp)); |
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c index ae853ccd0cd5..42f3a61db87c 100644 --- a/drivers/pci/hotplug/cpci_hotplug_pci.c +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c | |||
@@ -292,8 +292,8 @@ int __ref cpci_configure_slot(struct slot *slot) | |||
292 | (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { | 292 | (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { |
293 | /* Find an unused bus number for the new bridge */ | 293 | /* Find an unused bus number for the new bridge */ |
294 | struct pci_bus *child; | 294 | struct pci_bus *child; |
295 | unsigned char busnr, start = parent->secondary; | 295 | unsigned char busnr, start = parent->busn_res.start; |
296 | unsigned char end = parent->subordinate; | 296 | unsigned char end = parent->busn_res.end; |
297 | 297 | ||
298 | for (busnr = start; busnr <= end; busnr++) { | 298 | for (busnr = start; busnr <= end; busnr++) { |
299 | if (!pci_find_bus(pci_domain_nr(parent), | 299 | if (!pci_find_bus(pci_domain_nr(parent), |
@@ -312,7 +312,7 @@ int __ref cpci_configure_slot(struct slot *slot) | |||
312 | pci_dev_put(dev); | 312 | pci_dev_put(dev); |
313 | continue; | 313 | continue; |
314 | } | 314 | } |
315 | child->subordinate = pci_do_scan_bus(child); | 315 | child->busn_res.end = pci_do_scan_bus(child); |
316 | pci_bus_size_bridges(child); | 316 | pci_bus_size_bridges(child); |
317 | } | 317 | } |
318 | pci_dev_put(dev); | 318 | pci_dev_put(dev); |
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index 47d9dc06b109..b898f06b588d 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c | |||
@@ -37,8 +37,8 @@ | |||
37 | static int __ref pciehp_add_bridge(struct pci_dev *dev) | 37 | static int __ref pciehp_add_bridge(struct pci_dev *dev) |
38 | { | 38 | { |
39 | struct pci_bus *parent = dev->bus; | 39 | struct pci_bus *parent = dev->bus; |
40 | int pass, busnr, start = parent->secondary; | 40 | int pass, busnr, start = parent->busn_res.start; |
41 | int end = parent->subordinate; | 41 | int end = parent->busn_res.end; |
42 | 42 | ||
43 | for (busnr = start; busnr <= end; busnr++) { | 43 | for (busnr = start; busnr <= end; busnr++) { |
44 | if (!pci_find_bus(pci_domain_nr(parent), busnr)) | 44 | if (!pci_find_bus(pci_domain_nr(parent), busnr)) |
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c index df7e4bfadae3..d021eb031b3c 100644 --- a/drivers/pci/hotplug/shpchp_pci.c +++ b/drivers/pci/hotplug/shpchp_pci.c | |||
@@ -64,8 +64,8 @@ int __ref shpchp_configure_device(struct slot *p_slot) | |||
64 | (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { | 64 | (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { |
65 | /* Find an unused bus number for the new bridge */ | 65 | /* Find an unused bus number for the new bridge */ |
66 | struct pci_bus *child; | 66 | struct pci_bus *child; |
67 | unsigned char busnr, start = parent->secondary; | 67 | unsigned char busnr, start = parent->busn_res.start; |
68 | unsigned char end = parent->subordinate; | 68 | unsigned char end = parent->busn_res.end; |
69 | for (busnr = start; busnr <= end; busnr++) { | 69 | for (busnr = start; busnr <= end; busnr++) { |
70 | if (!pci_find_bus(pci_domain_nr(parent), | 70 | if (!pci_find_bus(pci_domain_nr(parent), |
71 | busnr)) | 71 | busnr)) |
@@ -84,7 +84,7 @@ int __ref shpchp_configure_device(struct slot *p_slot) | |||
84 | pci_dev_put(dev); | 84 | pci_dev_put(dev); |
85 | continue; | 85 | continue; |
86 | } | 86 | } |
87 | child->subordinate = pci_do_scan_bus(child); | 87 | child->busn_res.end = pci_do_scan_bus(child); |
88 | pci_bus_size_bridges(child); | 88 | pci_bus_size_bridges(child); |
89 | } | 89 | } |
90 | pci_configure_slot(dev); | 90 | pci_configure_slot(dev); |
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c index efa30da1ae8f..eeb23ceae4a8 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c | |||
@@ -73,13 +73,13 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha | |||
73 | } | 73 | } |
74 | } | 74 | } |
75 | out += sprintf(out, "Free resources: bus numbers\n"); | 75 | out += sprintf(out, "Free resources: bus numbers\n"); |
76 | for (busnr = bus->secondary; busnr <= bus->subordinate; busnr++) { | 76 | for (busnr = bus->busn_res.start; busnr <= bus->busn_res.end; busnr++) { |
77 | if (!pci_find_bus(pci_domain_nr(bus), busnr)) | 77 | if (!pci_find_bus(pci_domain_nr(bus), busnr)) |
78 | break; | 78 | break; |
79 | } | 79 | } |
80 | if (busnr < bus->subordinate) | 80 | if (busnr < bus->busn_res.end) |
81 | out += sprintf(out, "start = %8.8x, length = %8.8x\n", | 81 | out += sprintf(out, "start = %8.8x, length = %8.8x\n", |
82 | busnr, (bus->subordinate - busnr)); | 82 | busnr, (int)(bus->busn_res.end - busnr)); |
83 | 83 | ||
84 | return out - buf; | 84 | return out - buf; |
85 | } | 85 | } |
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 6554e1a0f634..e873060fb35b 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c | |||
@@ -47,7 +47,7 @@ static struct pci_bus *virtfn_add_bus(struct pci_bus *bus, int busnr) | |||
47 | if (!child) | 47 | if (!child) |
48 | return NULL; | 48 | return NULL; |
49 | 49 | ||
50 | child->subordinate = busnr; | 50 | child->busn_res.end = busnr; |
51 | child->dev.parent = bus->bridge; | 51 | child->dev.parent = bus->bridge; |
52 | rc = pci_bus_add_child(child); | 52 | rc = pci_bus_add_child(child); |
53 | if (rc) { | 53 | if (rc) { |
@@ -327,7 +327,7 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) | |||
327 | iov->offset = offset; | 327 | iov->offset = offset; |
328 | iov->stride = stride; | 328 | iov->stride = stride; |
329 | 329 | ||
330 | if (virtfn_bus(dev, nr_virtfn - 1) > dev->bus->subordinate) { | 330 | if (virtfn_bus(dev, nr_virtfn - 1) > dev->bus->busn_res.end) { |
331 | dev_err(&dev->dev, "SR-IOV: bus number out of range\n"); | 331 | dev_err(&dev->dev, "SR-IOV: bus number out of range\n"); |
332 | return -ENOMEM; | 332 | return -ENOMEM; |
333 | } | 333 | } |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 447e83472c01..aeda6e9c245c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -110,7 +110,7 @@ unsigned char pci_bus_max_busnr(struct pci_bus* bus) | |||
110 | struct list_head *tmp; | 110 | struct list_head *tmp; |
111 | unsigned char max, n; | 111 | unsigned char max, n; |
112 | 112 | ||
113 | max = bus->subordinate; | 113 | max = bus->busn_res.end; |
114 | list_for_each(tmp, &bus->children) { | 114 | list_for_each(tmp, &bus->children) { |
115 | n = pci_bus_max_busnr(pci_bus_b(tmp)); | 115 | n = pci_bus_max_busnr(pci_bus_b(tmp)); |
116 | if(n > max) | 116 | if(n > max) |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 658ac977cb56..651b096134dc 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -381,8 +381,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
381 | if (pci_is_root_bus(child)) /* It's a host bus, nothing to read */ | 381 | if (pci_is_root_bus(child)) /* It's a host bus, nothing to read */ |
382 | return; | 382 | return; |
383 | 383 | ||
384 | dev_info(&dev->dev, "PCI bridge to [bus %02x-%02x]%s\n", | 384 | dev_info(&dev->dev, "PCI bridge to %pR%s\n", |
385 | child->secondary, child->subordinate, | 385 | &child->busn_res, |
386 | dev->transparent ? " (subtractive decode)" : ""); | 386 | dev->transparent ? " (subtractive decode)" : ""); |
387 | 387 | ||
388 | pci_bus_remove_resources(child); | 388 | pci_bus_remove_resources(child); |
@@ -599,9 +599,9 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, | |||
599 | * Set up the primary, secondary and subordinate | 599 | * Set up the primary, secondary and subordinate |
600 | * bus numbers. | 600 | * bus numbers. |
601 | */ | 601 | */ |
602 | child->number = child->secondary = busnr; | 602 | child->number = child->busn_res.start = busnr; |
603 | child->primary = parent->secondary; | 603 | child->primary = parent->busn_res.start; |
604 | child->subordinate = 0xff; | 604 | child->busn_res.end = 0xff; |
605 | 605 | ||
606 | if (!bridge) | 606 | if (!bridge) |
607 | return child; | 607 | return child; |
@@ -643,8 +643,8 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) | |||
643 | if (!pcibios_assign_all_busses()) | 643 | if (!pcibios_assign_all_busses()) |
644 | return; | 644 | return; |
645 | 645 | ||
646 | while (parent->parent && parent->subordinate < max) { | 646 | while (parent->parent && parent->busn_res.end < max) { |
647 | parent->subordinate = max; | 647 | parent->busn_res.end = max; |
648 | pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); | 648 | pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); |
649 | parent = parent->parent; | 649 | parent = parent->parent; |
650 | } | 650 | } |
@@ -718,15 +718,15 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
718 | if (!child) | 718 | if (!child) |
719 | goto out; | 719 | goto out; |
720 | child->primary = primary; | 720 | child->primary = primary; |
721 | child->subordinate = subordinate; | 721 | child->busn_res.end = subordinate; |
722 | child->bridge_ctl = bctl; | 722 | child->bridge_ctl = bctl; |
723 | } | 723 | } |
724 | 724 | ||
725 | cmax = pci_scan_child_bus(child); | 725 | cmax = pci_scan_child_bus(child); |
726 | if (cmax > max) | 726 | if (cmax > max) |
727 | max = cmax; | 727 | max = cmax; |
728 | if (child->subordinate > max) | 728 | if (child->busn_res.end > max) |
729 | max = child->subordinate; | 729 | max = child->busn_res.end; |
730 | } else { | 730 | } else { |
731 | /* | 731 | /* |
732 | * We need to assign a number to this bus which we always | 732 | * We need to assign a number to this bus which we always |
@@ -759,8 +759,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
759 | } | 759 | } |
760 | buses = (buses & 0xff000000) | 760 | buses = (buses & 0xff000000) |
761 | | ((unsigned int)(child->primary) << 0) | 761 | | ((unsigned int)(child->primary) << 0) |
762 | | ((unsigned int)(child->secondary) << 8) | 762 | | ((unsigned int)(child->busn_res.start) << 8) |
763 | | ((unsigned int)(child->subordinate) << 16); | 763 | | ((unsigned int)(child->busn_res.end) << 16); |
764 | 764 | ||
765 | /* | 765 | /* |
766 | * yenta.c forces a secondary latency timer of 176. | 766 | * yenta.c forces a secondary latency timer of 176. |
@@ -805,8 +805,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
805 | break; | 805 | break; |
806 | while (parent->parent) { | 806 | while (parent->parent) { |
807 | if ((!pcibios_assign_all_busses()) && | 807 | if ((!pcibios_assign_all_busses()) && |
808 | (parent->subordinate > max) && | 808 | (parent->busn_res.end > max) && |
809 | (parent->subordinate <= max+i)) { | 809 | (parent->busn_res.end <= max+i)) { |
810 | j = 1; | 810 | j = 1; |
811 | } | 811 | } |
812 | parent = parent->parent; | 812 | parent = parent->parent; |
@@ -827,7 +827,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
827 | /* | 827 | /* |
828 | * Set the subordinate bus number to its real value. | 828 | * Set the subordinate bus number to its real value. |
829 | */ | 829 | */ |
830 | child->subordinate = max; | 830 | child->busn_res.end = max; |
831 | pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); | 831 | pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); |
832 | } | 832 | } |
833 | 833 | ||
@@ -837,19 +837,19 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, | |||
837 | 837 | ||
838 | /* Has only triggered on CardBus, fixup is in yenta_socket */ | 838 | /* Has only triggered on CardBus, fixup is in yenta_socket */ |
839 | while (bus->parent) { | 839 | while (bus->parent) { |
840 | if ((child->subordinate > bus->subordinate) || | 840 | if ((child->busn_res.end > bus->busn_res.end) || |
841 | (child->number > bus->subordinate) || | 841 | (child->number > bus->busn_res.end) || |
842 | (child->number < bus->number) || | 842 | (child->number < bus->number) || |
843 | (child->subordinate < bus->number)) { | 843 | (child->busn_res.end < bus->number)) { |
844 | dev_info(&child->dev, "[bus %02x-%02x] %s " | 844 | dev_info(&child->dev, "%pR %s " |
845 | "hidden behind%s bridge %s [bus %02x-%02x]\n", | 845 | "hidden behind%s bridge %s %pR\n", |
846 | child->number, child->subordinate, | 846 | &child->busn_res, |
847 | (bus->number > child->subordinate && | 847 | (bus->number > child->busn_res.end && |
848 | bus->subordinate < child->number) ? | 848 | bus->busn_res.end < child->number) ? |
849 | "wholly" : "partially", | 849 | "wholly" : "partially", |
850 | bus->self->transparent ? " transparent" : "", | 850 | bus->self->transparent ? " transparent" : "", |
851 | dev_name(&bus->dev), | 851 | dev_name(&bus->dev), |
852 | bus->number, bus->subordinate); | 852 | &bus->busn_res); |
853 | } | 853 | } |
854 | bus = bus->parent; | 854 | bus = bus->parent; |
855 | } | 855 | } |
@@ -1548,7 +1548,7 @@ EXPORT_SYMBOL_GPL(pcie_bus_configure_settings); | |||
1548 | 1548 | ||
1549 | unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) | 1549 | unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) |
1550 | { | 1550 | { |
1551 | unsigned int devfn, pass, max = bus->secondary; | 1551 | unsigned int devfn, pass, max = bus->busn_res.start; |
1552 | struct pci_dev *dev; | 1552 | struct pci_dev *dev; |
1553 | 1553 | ||
1554 | dev_dbg(&bus->dev, "scanning bus\n"); | 1554 | dev_dbg(&bus->dev, "scanning bus\n"); |
@@ -1642,7 +1642,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, | |||
1642 | /* Create legacy_io and legacy_mem files for this bus */ | 1642 | /* Create legacy_io and legacy_mem files for this bus */ |
1643 | pci_create_legacy_files(b); | 1643 | pci_create_legacy_files(b); |
1644 | 1644 | ||
1645 | b->number = b->secondary = bus; | 1645 | b->number = b->busn_res.start = bus; |
1646 | 1646 | ||
1647 | if (parent) | 1647 | if (parent) |
1648 | dev_info(parent, "PCI host bridge to bus %s\n", dev_name(&b->dev)); | 1648 | dev_info(parent, "PCI host bridge to bus %s\n", dev_name(&b->dev)); |
@@ -1693,7 +1693,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, | |||
1693 | if (!b) | 1693 | if (!b) |
1694 | return NULL; | 1694 | return NULL; |
1695 | 1695 | ||
1696 | b->subordinate = pci_scan_child_bus(b); | 1696 | b->busn_res.end = pci_scan_child_bus(b); |
1697 | pci_bus_add_devices(b); | 1697 | pci_bus_add_devices(b); |
1698 | return b; | 1698 | return b; |
1699 | } | 1699 | } |
@@ -1710,7 +1710,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, | |||
1710 | pci_add_resource(&resources, &iomem_resource); | 1710 | pci_add_resource(&resources, &iomem_resource); |
1711 | b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); | 1711 | b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); |
1712 | if (b) | 1712 | if (b) |
1713 | b->subordinate = pci_scan_child_bus(b); | 1713 | b->busn_res.end = pci_scan_child_bus(b); |
1714 | else | 1714 | else |
1715 | pci_free_resource_list(&resources); | 1715 | pci_free_resource_list(&resources); |
1716 | return b; | 1716 | return b; |
@@ -1727,7 +1727,7 @@ struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, | |||
1727 | pci_add_resource(&resources, &iomem_resource); | 1727 | pci_add_resource(&resources, &iomem_resource); |
1728 | b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources); | 1728 | b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources); |
1729 | if (b) { | 1729 | if (b) { |
1730 | b->subordinate = pci_scan_child_bus(b); | 1730 | b->busn_res.end = pci_scan_child_bus(b); |
1731 | pci_bus_add_devices(b); | 1731 | pci_bus_add_devices(b); |
1732 | } else { | 1732 | } else { |
1733 | pci_free_resource_list(&resources); | 1733 | pci_free_resource_list(&resources); |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8fa2d4be88de..192172c87b77 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -404,8 +404,8 @@ void pci_setup_cardbus(struct pci_bus *bus) | |||
404 | struct resource *res; | 404 | struct resource *res; |
405 | struct pci_bus_region region; | 405 | struct pci_bus_region region; |
406 | 406 | ||
407 | dev_info(&bridge->dev, "CardBus bridge to [bus %02x-%02x]\n", | 407 | dev_info(&bridge->dev, "CardBus bridge to %pR\n", |
408 | bus->secondary, bus->subordinate); | 408 | &bus->busn_res); |
409 | 409 | ||
410 | res = bus->resource[0]; | 410 | res = bus->resource[0]; |
411 | pcibios_resource_to_bus(bridge, ®ion, res); | 411 | pcibios_resource_to_bus(bridge, ®ion, res); |
@@ -553,8 +553,8 @@ static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type) | |||
553 | { | 553 | { |
554 | struct pci_dev *bridge = bus->self; | 554 | struct pci_dev *bridge = bus->self; |
555 | 555 | ||
556 | dev_info(&bridge->dev, "PCI bridge to [bus %02x-%02x]\n", | 556 | dev_info(&bridge->dev, "PCI bridge to %pR\n", |
557 | bus->secondary, bus->subordinate); | 557 | &bus->busn_res); |
558 | 558 | ||
559 | if (type & IORESOURCE_IO) | 559 | if (type & IORESOURCE_IO) |
560 | pci_setup_bridge_io(bus); | 560 | pci_setup_bridge_io(bus); |
@@ -745,8 +745,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, | |||
745 | if (!size0 && !size1) { | 745 | if (!size0 && !size1) { |
746 | if (b_res->start || b_res->end) | 746 | if (b_res->start || b_res->end) |
747 | dev_info(&bus->self->dev, "disabling bridge window " | 747 | dev_info(&bus->self->dev, "disabling bridge window " |
748 | "%pR to [bus %02x-%02x] (unused)\n", b_res, | 748 | "%pR to %pR (unused)\n", b_res, |
749 | bus->secondary, bus->subordinate); | 749 | &bus->busn_res); |
750 | b_res->flags = 0; | 750 | b_res->flags = 0; |
751 | return; | 751 | return; |
752 | } | 752 | } |
@@ -757,8 +757,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, | |||
757 | if (size1 > size0 && realloc_head) { | 757 | if (size1 > size0 && realloc_head) { |
758 | add_to_list(realloc_head, bus->self, b_res, size1-size0, 4096); | 758 | add_to_list(realloc_head, bus->self, b_res, size1-size0, 4096); |
759 | dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " | 759 | dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " |
760 | "%pR to [bus %02x-%02x] add_size %lx\n", b_res, | 760 | "%pR to %pR add_size %lx\n", b_res, |
761 | bus->secondary, bus->subordinate, size1-size0); | 761 | &bus->busn_res, size1-size0); |
762 | } | 762 | } |
763 | } | 763 | } |
764 | 764 | ||
@@ -863,8 +863,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, | |||
863 | if (!size0 && !size1) { | 863 | if (!size0 && !size1) { |
864 | if (b_res->start || b_res->end) | 864 | if (b_res->start || b_res->end) |
865 | dev_info(&bus->self->dev, "disabling bridge window " | 865 | dev_info(&bus->self->dev, "disabling bridge window " |
866 | "%pR to [bus %02x-%02x] (unused)\n", b_res, | 866 | "%pR to %pR (unused)\n", b_res, |
867 | bus->secondary, bus->subordinate); | 867 | &bus->busn_res); |
868 | b_res->flags = 0; | 868 | b_res->flags = 0; |
869 | return 1; | 869 | return 1; |
870 | } | 870 | } |
@@ -874,8 +874,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, | |||
874 | if (size1 > size0 && realloc_head) { | 874 | if (size1 > size0 && realloc_head) { |
875 | add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align); | 875 | add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align); |
876 | dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " | 876 | dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " |
877 | "%pR to [bus %02x-%02x] add_size %llx\n", b_res, | 877 | "%pR to %pR add_size %llx\n", b_res, |
878 | bus->secondary, bus->subordinate, (unsigned long long)size1-size0); | 878 | &bus->busn_res, (unsigned long long)size1-size0); |
879 | } | 879 | } |
880 | return 1; | 880 | return 1; |
881 | } | 881 | } |