From patchwork Tue Nov 11 12:51:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5274261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4C099F387 for ; Tue, 11 Nov 2014 12:54:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12D7E2010E for ; Tue, 11 Nov 2014 12:54:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35E7F200E9 for ; Tue, 11 Nov 2014 12:54:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoAve-00050W-BZ; Tue, 11 Nov 2014 12:52:14 +0000 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoAvb-0004xY-QS for linux-arm-kernel@lists.infradead.org; Tue, 11 Nov 2014 12:52:12 +0000 Received: by mail-wg0-f47.google.com with SMTP id a1so11477655wgh.34 for ; Tue, 11 Nov 2014 04:51:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=yKgkdjFhHbuSN8fMaEArAJW5wHqS4W8BYVGLJTTR50A=; b=m9wDdqfSiXyrAbnDTtwZhQGm3+Jioq7UyYHi1A+LxotztPvIEf4g3bgagJkk8wLhA7 QbC+S19lDLdB3N0591clCDf8msaTr3Rwk2A00ZnFck9tbCT56OfbW8V+X+Bygwo1z9ld sTEyKuB8K3PBstPNTy2vYYgfYDZsJ5geEY+QqUdJ9rNra//xOohCENBdSeQC4d/5ct36 g94EfyGD2m2yDzVq6UTMtjXQN4k363ZxDZjhIUgFf4wr08HZIFizRff3h7MgCyrXwTI1 ahEoIOjXaVS+UNOoLI/rxblwj31lb4M5393q3mRGgX/KSyd25CJXq9sYeB4S1Dpc0PTC /D4A== X-Received: by 10.180.79.169 with SMTP id k9mr41259088wix.34.1415710309909; Tue, 11 Nov 2014 04:51:49 -0800 (PST) Received: from localhost (port-15178.pppoe.wtnet.de. [84.46.59.133]) by mx.google.com with ESMTPSA id dr5sm17395176wib.4.2014.11.11.04.51.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Nov 2014 04:51:49 -0800 (PST) From: Thierry Reding To: Arnd Bergmann Subject: [PATCH] ARM: sa11x0: Use void __iomem * in MMIO accessors Date: Tue, 11 Nov 2014 13:51:48 +0100 Message-Id: <1415710308-29662-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141111_045212_183077_B4FC245F X-CRM114-Status: GOOD ( 14.10 ) X-Spam-Score: -0.8 (/) Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding MMIO accessors such as readl() and writel() want a void __iomem * for the address. Update the BSE nanoEngine PCI driver to pass such pointers instead of unsigned long in preparation to converting ARM to use generic and more rigidly typed accessors. Reported-by: kbuild test robot Signed-off-by: Thierry Reding --- Hi Arnd, This is a follow-up patch to the asm-generic/io.h overhaul series that fixes a couple of build warnings reported by Fengguang's build system. I've sorted this near the beginning of the series, like so: ARM: ebsa110: Properly override I/O accessors ARM: sa11x0: Use void __iomem * in MMIO accessors ARC: Remove redundant PCI_IOBASE declaration But I think anywhere before commit ARM: Use include/asm-generic/io.h should be fine, too. Thierry arch/arm/mach-sa1100/pci-nanoengine.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c index ff02e2da99f2..b704433c529c 100644 --- a/arch/arm/mach-sa1100/pci-nanoengine.c +++ b/arch/arm/mach-sa1100/pci-nanoengine.c @@ -33,12 +33,12 @@ static DEFINE_SPINLOCK(nano_lock); static int nanoengine_get_pci_address(struct pci_bus *bus, - unsigned int devfn, int where, unsigned long *address) + unsigned int devfn, int where, void __iomem **address) { int ret = PCIBIOS_DEVICE_NOT_FOUND; unsigned int busnr = bus->number; - *address = NANO_PCI_CONFIG_SPACE_VIRT + + *address = (void __iomem *)NANO_PCI_CONFIG_SPACE_VIRT + ((bus->number << 16) | (devfn << 8) | (where & ~3)); ret = (busnr > 255 || devfn > 255 || where > 255) ? @@ -51,7 +51,7 @@ static int nanoengine_read_config(struct pci_bus *bus, unsigned int devfn, int w int size, u32 *val) { int ret; - unsigned long address; + void __iomem *address; unsigned long flags; u32 v; @@ -85,7 +85,7 @@ static int nanoengine_write_config(struct pci_bus *bus, unsigned int devfn, int int size, u32 val) { int ret; - unsigned long address; + void __iomem *address; unsigned long flags; unsigned shift; u32 v;