Skip to content

Commit

Permalink
PCI: hisi: Remove redundant struct hisi_pcie.reg_base
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas committed Oct 12, 2016
1 parent bf4ed37 commit 761c43c
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/pci/host/pcie-hisi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 761c43c

Please sign in to comment.