| Message ID | 1351419853-25146-2-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/28/2012 04:24 AM, Thomas Petazzoni wrote: > Like we now do for all ARM platforms, use IOMEM() to define virtual > address constants, so that they get typed as 'void __iomem *' > pointers. It for now requires a cast when defining the map_desc entry, > but that cast should disappear once we switch map_desc to the usage of > 'void __iomem *' pointers. > diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c > static struct map_desc io_map __initdata = { > - .virtual = BCM2835_PERIPH_VIRT, > + .virtual = (unsigned long) BCM2835_PERIPH_VIRT, Very nit-picky, but there shouldn't be a space after the cast there.
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c index cb2f963..9366c8f 100644 --- a/arch/arm/mach-bcm2835/bcm2835.c +++ b/arch/arm/mach-bcm2835/bcm2835.c @@ -24,7 +24,7 @@ #include "bcm2835.h" static struct map_desc io_map __initdata = { - .virtual = BCM2835_PERIPH_VIRT, + .virtual = (unsigned long) BCM2835_PERIPH_VIRT, .pfn = __phys_to_pfn(BCM2835_PERIPH_PHYS), .length = BCM2835_PERIPH_SIZE, .type = MT_DEVICE diff --git a/arch/arm/mach-bcm2835/bcm2835.h b/arch/arm/mach-bcm2835/bcm2835.h index 8fbad3a..db9d51e 100644 --- a/arch/arm/mach-bcm2835/bcm2835.h +++ b/arch/arm/mach-bcm2835/bcm2835.h @@ -21,7 +21,7 @@ #include <asm/sizes.h> #define BCM2835_PERIPH_PHYS 0x20000000 -#define BCM2835_PERIPH_VIRT 0xf0000000 +#define BCM2835_PERIPH_VIRT IOMEM(0xf0000000) #define BCM2835_PERIPH_SIZE SZ_16M #endif
Like we now do for all ARM platforms, use IOMEM() to define virtual address constants, so that they get typed as 'void __iomem *' pointers. It for now requires a cast when defining the map_desc entry, but that cast should disappear once we switch map_desc to the usage of 'void __iomem *' pointers. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/mach-bcm2835/bcm2835.c | 2 +- arch/arm/mach-bcm2835/bcm2835.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)