Remove the struct ls_pcie.dbi member, which is a duplicate of the generic
pp.dbi_base member.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
---
 drivers/pci/host/pci-layerscape.c |   24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/pci/host/pci-layerscape.c 
b/drivers/pci/host/pci-layerscape.c
index 85a90f1e..d69614c 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -45,7 +45,6 @@ struct ls_pcie_drvdata {
 };
 
 struct ls_pcie {
-       void __iomem *dbi;
        void __iomem *lut;
        struct regmap *scfg;
        struct pcie_port pp;
@@ -59,7 +58,7 @@ static bool ls_pcie_is_bridge(struct ls_pcie *ls)
 {
        u32 header_type;
 
-       header_type = ioread8(ls->dbi + PCI_HEADER_TYPE);
+       header_type = ioread8(ls->pp.dbi_base + PCI_HEADER_TYPE);
        header_type &= 0x7f;
 
        return header_type == PCI_HEADER_TYPE_BRIDGE;
@@ -68,13 +67,13 @@ static bool ls_pcie_is_bridge(struct ls_pcie *ls)
 /* Clear multi-function bit */
 static void ls_pcie_clear_multifunction(struct ls_pcie *ls)
 {
-       iowrite8(PCI_HEADER_TYPE_BRIDGE, ls->dbi + PCI_HEADER_TYPE);
+       iowrite8(PCI_HEADER_TYPE_BRIDGE, ls->pp.dbi_base + PCI_HEADER_TYPE);
 }
 
 /* Fix class value */
 static void ls_pcie_fix_class(struct ls_pcie *ls)
 {
-       iowrite16(PCI_CLASS_BRIDGE_PCI, ls->dbi + PCI_CLASS_DEVICE);
+       iowrite16(PCI_CLASS_BRIDGE_PCI, ls->pp.dbi_base + PCI_CLASS_DEVICE);
 }
 
 /* Drop MSG TLP except for Vendor MSG */
@@ -82,9 +81,9 @@ static void ls_pcie_drop_msg_tlp(struct ls_pcie *ls)
 {
        u32 val;
 
-       val = ioread32(ls->dbi + PCIE_STRFMR1);
+       val = ioread32(ls->pp.dbi_base + PCIE_STRFMR1);
        val &= 0xDFFFFFFF;
-       iowrite32(val, ls->dbi + PCIE_STRFMR1);
+       iowrite32(val, ls->pp.dbi_base + PCIE_STRFMR1);
 }
 
 static int ls1021_pcie_link_up(struct pcie_port *pp)
@@ -148,11 +147,11 @@ static void ls_pcie_host_init(struct pcie_port *pp)
 {
        struct ls_pcie *ls = to_ls_pcie(pp);
 
-       iowrite32(1, ls->dbi + PCIE_DBI_RO_WR_EN);
+       iowrite32(1, ls->pp.dbi_base + PCIE_DBI_RO_WR_EN);
        ls_pcie_fix_class(ls);
        ls_pcie_clear_multifunction(ls);
        ls_pcie_drop_msg_tlp(ls);
-       iowrite32(0, ls->dbi + PCIE_DBI_RO_WR_EN);
+       iowrite32(0, ls->pp.dbi_base + PCIE_DBI_RO_WR_EN);
 }
 
 static int ls_pcie_msi_host_init(struct pcie_port *pp,
@@ -219,7 +218,6 @@ static int __init ls_add_pcie_port(struct ls_pcie *ls,
        int ret;
 
        pp->dev = &pdev->dev;
-       pp->dbi_base = ls->dbi;
        pp->ops = ls->drvdata->ops;
 
        ret = dw_pcie_host_init(pp);
@@ -247,14 +245,14 @@ static int __init ls_pcie_probe(struct platform_device 
*pdev)
                return -ENOMEM;
 
        dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
-       ls->dbi = devm_ioremap_resource(&pdev->dev, dbi_base);
-       if (IS_ERR(ls->dbi)) {
+       ls->pp.dbi_base = devm_ioremap_resource(&pdev->dev, dbi_base);
+       if (IS_ERR(ls->pp.dbi_base)) {
                dev_err(&pdev->dev, "missing *regs* space\n");
-               return PTR_ERR(ls->dbi);
+               return PTR_ERR(ls->pp.dbi_base);
        }
 
        ls->drvdata = match->data;
-       ls->lut = ls->dbi + ls->drvdata->lut_offset;
+       ls->lut = ls->pp.dbi_base + ls->drvdata->lut_offset;
 
        if (!ls_pcie_is_bridge(ls))
                return -ENODEV;

Reply via email to