From: Arnd Bergmann <arnd@arndb.de>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 11/11] ARM: common/vic: use proper __iomem annotations
Date: Sat, 1 Oct 2011 21:22:00 +0200 [thread overview]
Message-ID: <1317496920-7764-12-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1317496920-7764-1-git-send-email-arnd@arndb.de>
In vic_init, we pass addr into readl, so it needs to be a
pointer, not a u32 address.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/common/vic.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 7aa4262..adccf6d 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -347,7 +347,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
/* Identify which VIC cell this one is, by reading the ID */
for (i = 0; i < 4; i++) {
- u32 addr = ((u32)base & PAGE_MASK) + 0xfe0 + (i * 4);
+ void __iomem *addr;
+ addr = (void __iomem *)((u32)base & PAGE_MASK) + 0xfe0 + (i * 4);
cellid |= (readl(addr) & 0xff) << (8 * i);
}
vendor = (cellid >> 12) & 0xff;
--
1.7.5.4
next prev parent reply other threads:[~2011-10-01 19:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-01 19:21 [PATCH 00/11] Generic ARM fixes for randconfig Arnd Bergmann
2011-10-01 19:21 ` [PATCH 01/11] ARM: export rtc_lock for nvram driver Arnd Bergmann
2011-10-02 15:21 ` Russell King - ARM Linux
2011-10-01 19:21 ` [PATCH 02/11] ARM: SMP depends on MMU Arnd Bergmann
2011-10-01 19:21 ` [PATCH 03/11] ARM: always use ARM_UNWIND for thumb2 kernels Arnd Bergmann
2011-10-01 19:21 ` [PATCH 04/11] ARM: allow building alignment.c without PROC_FS Arnd Bergmann
2011-10-01 19:21 ` [PATCH 05/11] ARM: vfp: use -mfloat-abi=soft to build vfp Arnd Bergmann
2011-10-03 14:04 ` Dave Martin
2011-10-01 19:21 ` [PATCH 06/11] ARM: pm: let platforms select cpu_suspend support Arnd Bergmann
2011-10-01 19:21 ` [PATCH 07/11] ARM: limit CONFIG_HAVE_IDE to platforms that do Arnd Bergmann
2011-10-01 19:21 ` [PATCH 08/11] ARM: add io{read,write}{16,32}be functions Arnd Bergmann
2011-10-01 19:21 ` [PATCH 09/11] ARM: pci: always export pcibios_bus_to_resource Arnd Bergmann
2011-10-01 19:21 ` [PATCH 10/11] ARM: OC_ETM should not select ARM_AMBA Arnd Bergmann
2011-10-01 19:22 ` Arnd Bergmann [this message]
2011-10-05 1:24 ` [PATCH 11/11] ARM: common/vic: use proper __iomem annotations H Hartley Sweeten
2011-10-02 13:46 ` [PATCH 12/11] ARM: include linux/highmem.h in uaccess functions Arnd Bergmann
2011-10-02 15:36 ` [PATCH 00/11] Generic ARM fixes for randconfig Russell King - ARM Linux
2011-10-02 15:42 ` Arnd Bergmann
2011-10-02 15:47 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317496920-7764-12-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®