p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Bjorn Helgaas 2016-10-06 13:34:23 -05:00
parent bf4ed37cbb
commit 761c43c735
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pci/host/pcie-hisi.c
View File

@ -38,7 +38,6 @@ struct pcie_soc_ops {
struct hisi_pcie { struct hisi_pcie {
struct regmap *subctrl; struct regmap *subctrl;
void __iomem *reg_base;
u32 port_id; u32 port_id;
struct pcie_port pp; struct pcie_port pp;
struct pcie_soc_ops *soc_ops; 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, static inline void hisi_pcie_apb_writel(struct hisi_pcie *hisi_pcie,
u32 val, u32 reg) 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) 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 */ /* 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"); reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");
hisi_pcie->reg_base = devm_ioremap_resource(dev, reg); pp->dbi_base = devm_ioremap_resource(dev, reg);
if (IS_ERR(hisi_pcie->reg_base)) { if (IS_ERR(pp->dbi_base)) {
dev_err(dev, "cannot get rc_dbi base\n"); 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); ret = hisi_add_pcie_port(pp, pdev);
if (ret) if (ret)
return ret; return ret;