Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> --- drivers/pci/setup-res.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index eea85da..161a015 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -92,7 +92,7 @@ void pci_update_resource(struct pci_dev *dev, int resno) int pci_claim_resource(struct pci_dev *dev, int resource) { - struct resource *res = &dev->resource[resource]; + struct resource *res = pci_dev_resource_n(dev, resource); struct resource *root, *conflict; root = pci_find_parent_resource(dev, res); @@ -130,7 +130,7 @@ void pci_disable_bridge_window(struct pci_dev *dev) static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, int resno, resource_size_t size, resource_size_t align) { - struct resource *res = dev->resource + resno; + struct resource *res = pci_dev_resource_n(dev, resno); resource_size_t min; int ret; @@ -208,7 +208,7 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev, static int _pci_assign_resource(struct pci_dev *dev, int resno, int size, resource_size_t min_align) { - struct resource *res = dev->resource + resno; + struct resource *res = pci_dev_resource_n(dev, resno); struct pci_bus *bus; int ret; char *type; @@ -241,7 +241,7 @@ static int _pci_assign_resource(struct pci_dev *dev, int resno, int size, resour int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsize, resource_size_t min_align) { - struct resource *res = dev->resource + resno; + struct resource *res = pci_dev_resource_n(dev, resno); resource_size_t new_size; int ret; @@ -265,7 +265,7 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz int pci_assign_resource(struct pci_dev *dev, int resno) { - struct resource *res = dev->resource + resno; + struct resource *res = pci_dev_resource_n(dev, resno); resource_size_t align, size; struct pci_bus *bus; int ret; @@ -307,12 +307,10 @@ int pci_enable_resources(struct pci_dev *dev, int mask) pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd = cmd; - for (i = 0; i < PCI_NUM_RESOURCES; i++) { + for_each_pci_dev_all_resource(dev, r, i) { if (!(mask & (1 << i))) continue; - r = &dev->resource[i]; - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) continue; if ((i == PCI_ROM_RESOURCE) && -- 1.7.7 -- 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