From patchwork Fri Oct 7 16:37:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366837 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 66DDC60752 for ; Fri, 7 Oct 2016 16:37:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590F12977A for ; Fri, 7 Oct 2016 16:37:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DFD22977C; Fri, 7 Oct 2016 16:37:48 +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 D05F12977A for ; Fri, 7 Oct 2016 16:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964850AbcJGQhr (ORCPT ); Fri, 7 Oct 2016 12:37:47 -0400 Received: from mail.kernel.org ([198.145.29.136]:55580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964789AbcJGQhq (ORCPT ); Fri, 7 Oct 2016 12:37:46 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22D84203E1; Fri, 7 Oct 2016 16:37:45 +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 92F4C201D3; Fri, 7 Oct 2016 16:37:43 +0000 (UTC) Subject: [PATCH 07/11] PCI: hisi: Swap order of hisi_apb_writel() reg/val arguments To: Zhou Wang , Gabriele Paoloni From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Date: Fri, 07 Oct 2016 11:37:41 -0500 Message-ID: <20161007163741.25540.5909.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 Swap order of hisi_apb_writel() arguments to match the "dev, pos, val" order used by pci_write_config_word() and other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pcie-hisi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 e14ce13..c6b0459 100644 --- a/drivers/pci/host/pcie-hisi.c +++ b/drivers/pci/host/pcie-hisi.c @@ -48,7 +48,7 @@ static u32 hisi_apb_readl(struct hisi_pcie *hisi, u32 reg) return readl(hisi->pp.dbi_base + reg); } -static void hisi_apb_writel(struct hisi_pcie *hisi, u32 val, u32 reg) +static void hisi_apb_writel(struct hisi_pcie *hisi, u32 reg, u32 val) { writel(val, hisi->pp.dbi_base + reg); } @@ -88,15 +88,15 @@ static int hisi_cfg_write(struct pcie_port *pp, int where, int size, u32 val) walker += (where & 0x3); reg = where & ~0x3; if (size == 4) - hisi_apb_writel(hisi, val, reg); + hisi_apb_writel(hisi, reg, val); else if (size == 2) { reg_val = hisi_apb_readl(hisi, reg); *(u16 __force *) walker = val; - hisi_apb_writel(hisi, reg_val, reg); + hisi_apb_writel(hisi, reg, reg_val); } else if (size == 1) { reg_val = hisi_apb_readl(hisi, reg); *(u8 __force *) walker = val; - hisi_apb_writel(hisi, reg_val, reg); + hisi_apb_writel(hisi, reg, reg_val); } else return PCIBIOS_BAD_REGISTER_NUMBER;