diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-06 13:34:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-11 21:43:12 -0500 |
| commit | 761c43c73554d871cf3dae79b1881b56adcbc6f5 (patch) | |
| tree | 4124036c9b538ce9d7a161d009d2787200c71a82 | |
| parent | bf4ed37cbb3eeecd7007efdce9ce37983f72e45c (diff) | |
| download | mmc-761c43c73554d871cf3dae79b1881b56adcbc6f5.tar.gz | |
PCI: hisi: Remove redundant struct hisi_pcie.reg_base
Remove the struct hisi_pcie.reg_base member, which is a duplicate of the
generic pp.dbi_base member. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/host/pcie-hisi.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c index 28c95b89dee26b..f2bb206aaab22a 100644 --- a/drivers/pci/host/pcie-hisi.c +++ b/drivers/pci/host/pcie-hisi.c @@ -38,7 +38,6 @@ struct pcie_soc_ops { struct hisi_pcie { struct regmap *subctrl; - void __iomem *reg_base; u32 port_id; struct pcie_port pp; struct pcie_soc_ops *soc_ops; @@ -47,12 +46,12 @@ struct hisi_pcie { static inline void hisi_pcie_apb_writel(struct hisi_pcie *hisi_pcie, u32 val, u32 reg) { - writel(val, hisi_pcie->reg_base + reg); + writel(val, hisi_pcie->pp.dbi_base + reg); } static inline u32 hisi_pcie_apb_readl(struct hisi_pcie *hisi_pcie, u32 reg) { - return readl(hisi_pcie->reg_base + reg); + return readl(hisi_pcie->pp.dbi_base + reg); } /* HipXX PCIe host only supports 32-bit config access */ @@ -198,14 +197,12 @@ static int hisi_pcie_probe(struct platform_device *pdev) } reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi"); - hisi_pcie->reg_base = devm_ioremap_resource(dev, reg); - if (IS_ERR(hisi_pcie->reg_base)) { + pp->dbi_base = devm_ioremap_resource(dev, reg); + if (IS_ERR(pp->dbi_base)) { dev_err(dev, "cannot get rc_dbi base\n"); - return PTR_ERR(hisi_pcie->reg_base); + return PTR_ERR(pp->dbi_base); } - hisi_pcie->pp.dbi_base = hisi_pcie->reg_base; - ret = hisi_add_pcie_port(pp, pdev); if (ret) return ret; |