From patchwork Fri Oct 7 16:21:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366567 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 C1B4D60487 for ; Fri, 7 Oct 2016 16:23:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3DD029776 for ; Fri, 7 Oct 2016 16:23:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7EA829770; Fri, 7 Oct 2016 16:23:39 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1387929771 for ; Fri, 7 Oct 2016 16:23:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsXu5-0007LO-J6; Fri, 07 Oct 2016 16:21:45 +0000 Received: from mail.kernel.org ([198.145.29.136]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsXtq-0007Hl-6q for linux-arm-kernel@lists.infradead.org; Fri, 07 Oct 2016 16:21:30 +0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9394820374; Fri, 7 Oct 2016 16:21:09 +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 978CB2022D; Fri, 7 Oct 2016 16:21:08 +0000 (UTC) Subject: [PATCH 2/5] PCI: aardvark: Reorder accessor functions To: Thomas Petazzoni From: Bjorn Helgaas Date: Fri, 07 Oct 2016 11:21:06 -0500 Message-ID: <20161007162106.22668.45585.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007162053.22668.91420.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007162053.22668.91420.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161007_092130_359989_DFC87273 X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Reorder the accessors so the reader is first, as most other drivers do. Uninline them. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-aardvark.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index fd0e6af..3d629d4 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -209,14 +209,14 @@ struct advk_pcie { int root_bus_nr; }; -static inline void advk_writel(struct advk_pcie *advk, u32 val, u64 reg) +static u32 advk_readl(struct advk_pcie *advk, u64 reg) { - writel(val, advk->base + reg); + return readl(advk->base + reg); } -static inline u32 advk_readl(struct advk_pcie *advk, u64 reg) +static void advk_writel(struct advk_pcie *advk, u32 val, u64 reg) { - return readl(advk->base + reg); + writel(val, advk->base + reg); } static int advk_pcie_link_up(struct advk_pcie *advk)