From patchwork Fri Oct 7 16:34:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366785 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 B9581608A7 for ; Fri, 7 Oct 2016 16:36:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABFB629777 for ; Fri, 7 Oct 2016 16:36:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0B222977A; Fri, 7 Oct 2016 16:36:05 +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 566742977C for ; Fri, 7 Oct 2016 16:36:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757374AbcJGQf5 (ORCPT ); Fri, 7 Oct 2016 12:35:57 -0400 Received: from mail.kernel.org ([198.145.29.136]:51620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964798AbcJGQet (ORCPT ); Fri, 7 Oct 2016 12:34:49 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 323B820340; Fri, 7 Oct 2016 16:34:48 +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 01BC5200E3; Fri, 7 Oct 2016 16:34:46 +0000 (UTC) Subject: [PATCH 6/9] PCI: dra7xx: Replace dra7xx_pcie_readl_rc() with dw_pcie_readl_rc() To: Kishon Vijay Abraham I From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-omap@vger.kernel.org Date: Fri, 07 Oct 2016 11:34:38 -0500 Message-ID: <20161007163438.24926.7897.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007163350.24926.17545.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007163350.24926.17545.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 The dw_pcie_readl_rc() and dw_pcie_writel_rc() interfaces do the same as dra7xx_pcie_readl_rc() and dra7xx_pcie_writel_rc(), and they also give us a clue that we're using the DesignWare-generic functionality. Use the dw_*() interfaces and remove the dra7xx-specific ones. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-dra7xx.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 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-dra7xx.c b/drivers/pci/host/pci-dra7xx.c index 118b612..5572613 100644 --- a/drivers/pci/host/pci-dra7xx.c +++ b/drivers/pci/host/pci-dra7xx.c @@ -82,17 +82,6 @@ static void dra7xx_writel(struct dra7xx_pcie *dra7xx, u32 offset, u32 value) writel(value, dra7xx->base + offset); } -static u32 dra7xx_pcie_readl_rc(struct dra7xx_pcie *dra7xx, u32 offset) -{ - return readl(dra7xx->pp.dbi_base + offset); -} - -static void dra7xx_pcie_writel_rc(struct dra7xx_pcie *dra7xx, u32 offset, - u32 value) -{ - writel(value, dra7xx->pp.dbi_base + offset); -} - static int dra7xx_pcie_link_up(struct pcie_port *pp) { struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp); @@ -448,9 +437,9 @@ static int dra7xx_pcie_suspend(struct device *dev) u32 val; /* clear MSE */ - val = dra7xx_pcie_readl_rc(dra7xx, PCI_COMMAND); + val = dw_pcie_readl_rc(&dra7xx->pp, PCI_COMMAND); val &= ~PCI_COMMAND_MEMORY; - dra7xx_pcie_writel_rc(dra7xx, PCI_COMMAND, val); + dw_pcie_writel_rc(&dra7xx->pp, PCI_COMMAND, val); return 0; } @@ -461,9 +450,9 @@ static int dra7xx_pcie_resume(struct device *dev) u32 val; /* set MSE */ - val = dra7xx_pcie_readl_rc(dra7xx, PCI_COMMAND); + val = dw_pcie_readl_rc(&dra7xx->pp, PCI_COMMAND); val |= PCI_COMMAND_MEMORY; - dra7xx_pcie_writel_rc(dra7xx, PCI_COMMAND, val); + dw_pcie_writel_rc(&dra7xx->pp, PCI_COMMAND, val); return 0; }