From patchwork Fri Oct 7 16:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366833 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52FF860752 for ; Fri, 7 Oct 2016 16:37:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44508295DD for ; Fri, 7 Oct 2016 16:37:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3918A29779; Fri, 7 Oct 2016 16:37:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF800295DD for ; Fri, 7 Oct 2016 16:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964814AbcJGQhW (ORCPT ); Fri, 7 Oct 2016 12:37:22 -0400 Received: from mail.kernel.org ([198.145.29.136]:55340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964789AbcJGQhW (ORCPT ); Fri, 7 Oct 2016 12:37:22 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 351E3201D3; Fri, 7 Oct 2016 16:37:21 +0000 (UTC) Received: from localhost (unknown [69.55.156.165]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 32336203E1; Fri, 7 Oct 2016 16:37:20 +0000 (UTC) Subject: [PATCH 04/11] PCI: hisi: Remove redundant struct hisi_pcie.reg_base To: Zhou Wang , Gabriele Paoloni From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Date: Fri, 07 Oct 2016 11:37:18 -0500 Message-ID: <20161007163718.25540.70173.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007163654.25540.29741.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007163654.25540.29741.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c index c2bdcd1..64f668c 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; @@ -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;