From patchwork Fri Oct 7 16:22:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366551 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 2B3DB60487 for ; Fri, 7 Oct 2016 16:22:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C4252975F for ; Fri, 7 Oct 2016 16:22:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F28629773; Fri, 7 Oct 2016 16:22:36 +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 87CED2975F for ; Fri, 7 Oct 2016 16:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938991AbcJGQWb (ORCPT ); Fri, 7 Oct 2016 12:22:31 -0400 Received: from mail.kernel.org ([198.145.29.136]:45718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938966AbcJGQWX (ORCPT ); Fri, 7 Oct 2016 12:22:23 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B42C820374; Fri, 7 Oct 2016 16:22: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 A4FCC2034B; Fri, 7 Oct 2016 16:22:20 +0000 (UTC) Subject: [PATCH 04/10] PCI: altera: Rename _altera_pcie_cfg_read() to altera_raw_cfg_read() To: Ley Foon Tan From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, rfi@lists.rocketboards.org Date: Fri, 07 Oct 2016 11:22:19 -0500 Message-ID: <20161007162218.22796.11928.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007162153.22796.13721.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007162153.22796.13721.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 Rename _altera_pcie_cfg_read() and _altera_pcie_cfg_write() to altera_raw_cfg_read() and altera_raw_cfg_write() to convey a little more information than an underline does. The difference is that altera_pcie_cfg_read() requires a pointer to a struct pci_bus, while altera_raw_cfg_read() needs only a pointer to a struct altera_pcie, so it can be used before enumerating the bus. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pcie-altera.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 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-altera.c b/drivers/pci/host/pcie-altera.c index 243e6bc..5362ac1 100644 --- a/drivers/pci/host/pcie-altera.c +++ b/drivers/pci/host/pcie-altera.c @@ -261,9 +261,9 @@ static int tlp_cfg_dword_write(struct altera_pcie *altera, u8 bus, u32 devfn, return PCIBIOS_SUCCESSFUL; } -static int _altera_pcie_cfg_read(struct altera_pcie *altera, u8 busno, - unsigned int devfn, int where, int size, - u32 *value) +static int altera_raw_cfg_read(struct altera_pcie *altera, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) { int ret; u32 data; @@ -301,9 +301,9 @@ static int _altera_pcie_cfg_read(struct altera_pcie *altera, u8 busno, return PCIBIOS_SUCCESSFUL; } -static int _altera_pcie_cfg_write(struct altera_pcie *altera, u8 busno, - unsigned int devfn, int where, int size, - u32 value) +static int altera_raw_cfg_write(struct altera_pcie *altera, u8 busno, + unsigned int devfn, int where, int size, + u32 value) { u32 data32; u32 shift = 8 * (where & 3); @@ -341,8 +341,8 @@ static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn, return PCIBIOS_DEVICE_NOT_FOUND; } - return _altera_pcie_cfg_read(altera, bus->number, devfn, where, size, - value); + return altera_raw_cfg_read(altera, bus->number, devfn, where, size, + value); } static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn, @@ -356,8 +356,8 @@ static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn, if (!altera_pcie_valid_config(altera, bus, PCI_SLOT(devfn))) return PCIBIOS_DEVICE_NOT_FOUND; - return _altera_pcie_cfg_write(altera, bus->number, devfn, where, size, - value); + return altera_raw_cfg_write(altera, bus->number, devfn, where, size, + value); } static struct pci_ops altera_pcie_ops = { @@ -371,9 +371,9 @@ static int altera_read_cap_word(struct altera_pcie *altera, u8 busno, u32 data; int ret; - ret = _altera_pcie_cfg_read(altera, busno, devfn, - PCIE_CAP_OFFSET + offset, sizeof(*value), - &data); + ret = altera_raw_cfg_read(altera, busno, devfn, + PCIE_CAP_OFFSET + offset, sizeof(*value), + &data); *value = data; return ret; } @@ -381,9 +381,9 @@ static int altera_read_cap_word(struct altera_pcie *altera, u8 busno, static int altera_write_cap_word(struct altera_pcie *altera, u8 busno, unsigned int devfn, int offset, u16 value) { - return _altera_pcie_cfg_write(altera, busno, devfn, - PCIE_CAP_OFFSET + offset, sizeof(value), - value); + return altera_raw_cfg_write(altera, busno, devfn, + PCIE_CAP_OFFSET + offset, sizeof(value), + value); } static void altera_wait_link_retrain(struct altera_pcie *altera)