From patchwork Fri Oct 7 16:43:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366969 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 DC1EF608A6 for ; Fri, 7 Oct 2016 16:43:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDF78296C4 for ; Fri, 7 Oct 2016 16:43:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2D182976E; Fri, 7 Oct 2016 16:43:43 +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 EB9BC296D3 for ; Fri, 7 Oct 2016 16:43:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965136AbcJGQng (ORCPT ); Fri, 7 Oct 2016 12:43:36 -0400 Received: from mail.kernel.org ([198.145.29.136]:58038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965040AbcJGQnF (ORCPT ); Fri, 7 Oct 2016 12:43:05 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04C0A203E1; Fri, 7 Oct 2016 16:43:04 +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 6D9D3203C0; Fri, 7 Oct 2016 16:43:02 +0000 (UTC) Subject: [PATCH 2/5] PCI: qcom: Remove redundant struct qcom_pcie.dbi To: Stanimir Varbanov From: Bjorn Helgaas Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org Date: Fri, 07 Oct 2016 11:43:00 -0500 Message-ID: <20161007164300.26464.22576.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007164251.26464.42894.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007164251.26464.42894.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 qcom_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/pcie-qcom.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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-qcom.c b/drivers/pci/host/pcie-qcom.c index e72e038..e425fcf 100644 --- a/drivers/pci/host/pcie-qcom.c +++ b/drivers/pci/host/pcie-qcom.c @@ -90,7 +90,6 @@ struct qcom_pcie { struct device *dev; union qcom_pcie_resources res; void __iomem *parf; - void __iomem *dbi; void __iomem *elbi; struct phy *phy; struct gpio_desc *reset; @@ -426,7 +425,7 @@ err_res: static int qcom_pcie_link_up(struct pcie_port *pp) { struct qcom_pcie *qcom = to_qcom_pcie(pp); - u16 val = readw(qcom->dbi + PCIE20_CAP + PCI_EXP_LNKSTA); + u16 val = readw(qcom->pp.dbi_base + PCIE20_CAP + PCI_EXP_LNKSTA); return !!(val & PCI_EXP_LNKSTA_DLLLA); } @@ -509,6 +508,8 @@ static int qcom_pcie_probe(struct platform_device *pdev) if (!qcom) return -ENOMEM; + pp = &qcom->pp; + qcom->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev); qcom->dev = dev; @@ -522,9 +523,9 @@ static int qcom_pcie_probe(struct platform_device *pdev) return PTR_ERR(qcom->parf); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); - qcom->dbi = devm_ioremap_resource(dev, res); - if (IS_ERR(qcom->dbi)) - return PTR_ERR(qcom->dbi); + pp->dbi_base = devm_ioremap_resource(dev, res); + if (IS_ERR(pp->dbi_base)) + return PTR_ERR(pp->dbi_base); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi"); qcom->elbi = devm_ioremap_resource(dev, res); @@ -539,9 +540,7 @@ static int qcom_pcie_probe(struct platform_device *pdev) if (ret) return ret; - pp = &qcom->pp; pp->dev = dev; - pp->dbi_base = qcom->dbi; pp->root_bus_nr = -1; pp->ops = &qcom_pcie_dw_ops;