PCI: dwc: keystone: Convert .scan_bus() callback to use add_bus

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pci-meson.c

diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index ca59ba9..f4d8221 100644 (file)
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -383,13 +383,12 @@ static void meson_pcie_enable_interrupts(struct meson_pcie *mp)
                dw_pcie_msi_init(&mp->pci.pp);
 }
 
-static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
-                                 u32 *val)
+static int meson_pcie_rd_own_conf(struct pci_bus *bus, u32 devfn,
+                                 int where, int size, u32 *val)
 {
-       struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
        int ret;
 
-       ret = dw_pcie_read(pci->dbi_base + where, size, val);
+       ret = pci_generic_config_read(bus, devfn, where, size, val);
        if (ret != PCIBIOS_SUCCESSFUL)
                return ret;
 
@@ -410,13 +409,11 @@ static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
        return PCIBIOS_SUCCESSFUL;
 }
 
-static int meson_pcie_wr_own_conf(struct pcie_port *pp, int where,
-                                 int size, u32 val)
-{
-       struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
-
-       return dw_pcie_write(pci->dbi_base + where, size, val);
-}
+static struct pci_ops meson_pci_ops = {
+       .map_bus = dw_pcie_own_conf_map_bus,
+       .read = meson_pcie_rd_own_conf,
+       .write = pci_generic_config_write,
+};
 
 static int meson_pcie_link_up(struct dw_pcie *pci)
 {
@@ -463,6 +460,8 @@ static int meson_pcie_host_init(struct pcie_port *pp)
        struct meson_pcie *mp = to_meson_pcie(pci);
        int ret;
 
+       pp->bridge->ops = &meson_pci_ops;
+
        ret = meson_pcie_establish_link(mp);
        if (ret)
                return ret;
@@ -473,8 +472,6 @@ static int meson_pcie_host_init(struct pcie_port *pp)
 }
 
 static const struct dw_pcie_host_ops meson_pcie_host_ops = {
-       .rd_own_conf = meson_pcie_rd_own_conf,
-       .wr_own_conf = meson_pcie_wr_own_conf,
        .host_init = meson_pcie_host_init,
 };
 
@@ -488,10 +485,8 @@ static int meson_add_pcie_port(struct meson_pcie *mp,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq(pdev, 0);
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "failed to get MSI IRQ\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        pp->ops = &meson_pcie_host_ops;