@@ -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;
@@ -46,12 +45,12 @@ struct hisi_pcie {
static u32 hisi_apb_readl(struct hisi_pcie *hisi, u32 reg)
{
- return readl(hisi->reg_base + reg);
+ return readl(hisi->pp.dbi_base + reg);
}
static void hisi_apb_writel(struct hisi_pcie *hisi, u32 val, u32 reg)
{
- writel(val, hisi->reg_base + reg);
+ writel(val, hisi->pp.dbi_base + reg);
}
/* HipXX PCIe host only supports 32-bit config access */
@@ -192,14 +191,12 @@ static int hisi_pcie_probe(struct platform_device *pdev)
}
reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");
- hisi->reg_base = devm_ioremap_resource(&pdev->dev, reg);
- if (IS_ERR(hisi->reg_base)) {
+ pp->dbi_base = devm_ioremap_resource(&pdev->dev, reg);
+ if (IS_ERR(pp->dbi_base)) {
dev_err(pp->dev, "cannot get rc_dbi base\n");
- return PTR_ERR(hisi->reg_base);
+ return PTR_ERR(pp->dbi_base);
}
- hisi->pp.dbi_base = hisi->reg_base;
-
ret = hisi_add_pcie_port(pp, pdev);
if (ret)
return ret;
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> --- drivers/pci/host/pcie-hisi.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html