This series replaces PCI_CONF1{,_EXT}_ADDRESS() with more generic helpers and makes them more widely available by placing the new helpers into include/linux/pci.h. Most of what is under drivers/pci/controller is converted to use the new helpers by this series. I left arch/ changes out from this because they're quite varied so they would be harder to verify (and review) except ARM/orion5x that I had to do now due to a naming conflict. Nonetheless, there is plenty custom type 0/1 code under arch/ that could now take advantage of the new helpers. I've postponed touching pcie-mediatek.c because there's odd slot calculation which I brought up in another thread. Ilpo Järvinen (10): ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way PCI: Add helpers to calculate PCI Conf Type 0/1 addresses ARM: orion5x: Pass devfn to orion5x_pci_hw_{rd,wr}_conf() ARM: orion5x: Use generic PCI Conf Type 1 helper PCI: ixp4xx: Use generic PCI Conf Type 0 helper PCI: ixp4xx: Replace 1 with PCI_CONF1_TRANSACTION PCI: Replace PCI_CONF1{,_EXT}_ADDRESS() with the new helpers PCI: tegra: Use generic PCI Conf Type 1 helper PCI: mvebu: Use generic PCI Conf Type 1 helper PCI: v3: Use generic PCI Conf Type 0/1 helpers arch/arm/mach-orion5x/pci.c | 54 +++++++---------- drivers/pci/controller/pci-ftpci100.c | 6 +- drivers/pci/controller/pci-ixp4xx.c | 9 ++- drivers/pci/controller/pci-mvebu.c | 13 +--- drivers/pci/controller/pci-tegra.c | 12 +--- drivers/pci/controller/pci-v3-semi.c | 6 +- drivers/pci/controller/pcie-mt7621.c | 7 +-- drivers/pci/pci.h | 45 -------------- include/linux/pci.h | 86 +++++++++++++++++++++++++++ 9 files changed, 123 insertions(+), 115 deletions(-) -- 2.39.2