Add definitions to allow for more explicit mapping of Peer-to-Peer (P2P) and CardBus bridge window resources. Added for P2P: PCI_BRIDGE_RESOURCES + 0 -> PCI_BRIDGE_IO_WINDOW PCI_BRIDGE_RESOURCES + 1 -> PCI_BRIDGE_MEM_WINDOW PCI_BRIDGE_RESOURCES + 2 -> PCI_BRIDGE_PREF_MEM_WINDOW Added for CardBus: PCI_BRIDGE_RESOURCES + 0 -> PCI_CB_BRIDGE_IO_0_WINDOW PCI_BRIDGE_RESOURCES + 1 -> PCI_CB_BRIDGE_IO_1_WINDOW PCI_BRIDGE_RESOURCES + 2 -> PCI_CB_BRIDGE_MEM_0_WINDOW PCI_BRIDGE_RESOURCES + 3 -> PCI_CB_BRIDGE_MEM_1_WINDOW The old way of addressing resources using an index: bridge->resource[PCI_BRIDGE_RESOURCES+0] Would now be replaced with: bridge->resource[PCI_BRIDGE_IO_WINDOW] This series of patches builds on top of the changes proposed before: https://lore.kernel.org/r/20100203233931.10803.39854.stgit@xxxxxxx https://lore.kernel.org/r/20100212170022.19522.81135.stgit@xxxxxxx Krzysztof Wilczynski (2): PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource definitions pcmcia: Use resources definitions when freeing CardBus resources --- Changes in v2: Split patches based on the feedback from Bjorn allowing for the patch that correct the PCI quirk for the ALI chipset to be applied independently, if someone needs to cherry-pick it, before updating the said quirk to use definitions for bridge window resources. Changes in v3: Remove the PCI quirk patch for ALI M7101 chipset as it's not needed. Remove surplus new variables added in pci_bus_size_cardbus(). drivers/pci/quirks.c | 37 +++++------ drivers/pci/setup-bus.c | 114 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 46 +++++++++----- include/linux/pci.h | 14 ++++- 4 files changed, 122 insertions(+), 89 deletions(-) -- 2.26.2