From patchwork Fri Oct 7 16:42:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366935 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 CE7A460752 for ; Fri, 7 Oct 2016 16:42:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0465296C4 for ; Fri, 7 Oct 2016 16:42:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4EBA2976E; Fri, 7 Oct 2016 16:42:34 +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 56D6E296C4 for ; Fri, 7 Oct 2016 16:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941274AbcJGQmR (ORCPT ); Fri, 7 Oct 2016 12:42:17 -0400 Received: from mail.kernel.org ([198.145.29.136]:57502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941180AbcJGQmO (ORCPT ); Fri, 7 Oct 2016 12:42:14 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86FFF203C2; Fri, 7 Oct 2016 16:42:12 +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 72799203A0; Fri, 7 Oct 2016 16:42:11 +0000 (UTC) Subject: [PATCH 3/7] PCI: layerscape: Remove redundant struct ls_pcie.dbi To: Minghuan Lian , Mingkai Hu , Roy Zang From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 07 Oct 2016 11:42:09 -0500 Message-ID: <20161007164209.26341.61199.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007164149.26341.87049.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007164149.26341.87049.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 ls_pcie.dbi member, which is a duplicate of the generic pp.dbi_base member. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-layerscape.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 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/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c index 85a90f1e..d69614c 100644 --- a/drivers/pci/host/pci-layerscape.c +++ b/drivers/pci/host/pci-layerscape.c @@ -45,7 +45,6 @@ struct ls_pcie_drvdata { }; struct ls_pcie { - void __iomem *dbi; void __iomem *lut; struct regmap *scfg; struct pcie_port pp; @@ -59,7 +58,7 @@ static bool ls_pcie_is_bridge(struct ls_pcie *ls) { u32 header_type; - header_type = ioread8(ls->dbi + PCI_HEADER_TYPE); + header_type = ioread8(ls->pp.dbi_base + PCI_HEADER_TYPE); header_type &= 0x7f; return header_type == PCI_HEADER_TYPE_BRIDGE; @@ -68,13 +67,13 @@ static bool ls_pcie_is_bridge(struct ls_pcie *ls) /* Clear multi-function bit */ static void ls_pcie_clear_multifunction(struct ls_pcie *ls) { - iowrite8(PCI_HEADER_TYPE_BRIDGE, ls->dbi + PCI_HEADER_TYPE); + iowrite8(PCI_HEADER_TYPE_BRIDGE, ls->pp.dbi_base + PCI_HEADER_TYPE); } /* Fix class value */ static void ls_pcie_fix_class(struct ls_pcie *ls) { - iowrite16(PCI_CLASS_BRIDGE_PCI, ls->dbi + PCI_CLASS_DEVICE); + iowrite16(PCI_CLASS_BRIDGE_PCI, ls->pp.dbi_base + PCI_CLASS_DEVICE); } /* Drop MSG TLP except for Vendor MSG */ @@ -82,9 +81,9 @@ static void ls_pcie_drop_msg_tlp(struct ls_pcie *ls) { u32 val; - val = ioread32(ls->dbi + PCIE_STRFMR1); + val = ioread32(ls->pp.dbi_base + PCIE_STRFMR1); val &= 0xDFFFFFFF; - iowrite32(val, ls->dbi + PCIE_STRFMR1); + iowrite32(val, ls->pp.dbi_base + PCIE_STRFMR1); } static int ls1021_pcie_link_up(struct pcie_port *pp) @@ -148,11 +147,11 @@ static void ls_pcie_host_init(struct pcie_port *pp) { struct ls_pcie *ls = to_ls_pcie(pp); - iowrite32(1, ls->dbi + PCIE_DBI_RO_WR_EN); + iowrite32(1, ls->pp.dbi_base + PCIE_DBI_RO_WR_EN); ls_pcie_fix_class(ls); ls_pcie_clear_multifunction(ls); ls_pcie_drop_msg_tlp(ls); - iowrite32(0, ls->dbi + PCIE_DBI_RO_WR_EN); + iowrite32(0, ls->pp.dbi_base + PCIE_DBI_RO_WR_EN); } static int ls_pcie_msi_host_init(struct pcie_port *pp, @@ -219,7 +218,6 @@ static int __init ls_add_pcie_port(struct ls_pcie *ls, int ret; pp->dev = &pdev->dev; - pp->dbi_base = ls->dbi; pp->ops = ls->drvdata->ops; ret = dw_pcie_host_init(pp); @@ -247,14 +245,14 @@ static int __init ls_pcie_probe(struct platform_device *pdev) return -ENOMEM; dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); - ls->dbi = devm_ioremap_resource(&pdev->dev, dbi_base); - if (IS_ERR(ls->dbi)) { + ls->pp.dbi_base = devm_ioremap_resource(&pdev->dev, dbi_base); + if (IS_ERR(ls->pp.dbi_base)) { dev_err(&pdev->dev, "missing *regs* space\n"); - return PTR_ERR(ls->dbi); + return PTR_ERR(ls->pp.dbi_base); } ls->drvdata = match->data; - ls->lut = ls->dbi + ls->drvdata->lut_offset; + ls->lut = ls->pp.dbi_base + ls->drvdata->lut_offset; if (!ls_pcie_is_bridge(ls)) return -ENODEV;