Merge branch 'pci/config' into next

* pci/config:
  PCI: xilinx: Convert to use generic config accessors
  PCI: xgene: Convert to use generic config accessors
  PCI: tegra: Convert to use generic config accessors
  PCI: rcar: Convert to use generic config accessors
  PCI: generic: Convert to use generic config accessors
  powerpc/powermac: Convert PCI to use generic config accessors
  powerpc/fsl_pci: Convert PCI to use generic config accessors
  ARM: ks8695: Convert PCI to use generic config accessors
  ARM: sa1100: Convert PCI to use generic config accessors
  ARM: integrator: Convert PCI to use generic config accessors
  ARM: cns3xxx: Convert PCI to use generic config accessors
  PCI: Add generic config accessors
  powerpc/PCI: Add struct pci_ops member names to initialization
  mn10300/PCI: Add struct pci_ops member names to initialization
  MIPS: PCI: Add struct pci_ops member names to initialization
  frv/PCI: Add struct pci_ops member names to initialization

1 files changed, 3 insertions, 43 deletions

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 6455c1eada1a..271b67e7670c 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -645,61 +645,21 @@ mapped:
         return pcie->cfg_type1 + offset;
 }
 
-static int mpc83xx_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
-                                    int offset, int len, u32 *val)
-{
-        void __iomem *cfg_addr;
-
-        cfg_addr = mpc83xx_pcie_remap_cfg(bus, devfn, offset);
-        if (!cfg_addr)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-
-        switch (len) {
-        case 1:
-                *val = in_8(cfg_addr);
-                break;
-        case 2:
-                *val = in_le16(cfg_addr);
-                break;
-        default:
-                *val = in_le32(cfg_addr);
-                break;
-        }
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
 static int mpc83xx_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
                                      int offset, int len, u32 val)
 {
         struct pci_controller *hose = pci_bus_to_host(bus);
-        void __iomem *cfg_addr;
-
-        cfg_addr = mpc83xx_pcie_remap_cfg(bus, devfn, offset);
-        if (!cfg_addr)
-                return PCIBIOS_DEVICE_NOT_FOUND;
 
         /* PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS */
         if (offset == PCI_PRIMARY_BUS && bus->number == hose->first_busno)
                 val &= 0xffffff00;
 
-        switch (len) {
-        case 1:
-                out_8(cfg_addr, val);
-                break;
-        case 2:
-                out_le16(cfg_addr, val);
-                break;
-        default:
-                out_le32(cfg_addr, val);
-                break;
-        }
-
-        return PCIBIOS_SUCCESSFUL;
+        return pci_generic_config_write(bus, devfn, offset, len, val);
 }
 
 static struct pci_ops mpc83xx_pcie_ops = {
-        .read = mpc83xx_pcie_read_config,
+        .map_bus = mpc83xx_pcie_remap_cfg,
+        .read = pci_generic_config_read,
         .write = mpc83xx_pcie_write_config,
 };