Skip to contentSkip to conversation

ARM: imx: Change type of ioremap function

PATCH New Laura Abbott 2 participants 2 messages May 1, 2013 – May 2, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: imx: Change type of ioremap function

Commit cd024d4245b2bfbd824b911f11a9756d1d6c167d
(ARM: 7704/1: mm: Use phys_addr_t properly for ioremap functions) changed the type of the ioremap functions to actually use phys_addr_t.

Switch the imx ioremap functions to use phys_addr_t to avoid warnings:

arch/arm/mach-imx/mm-imx3.c: In function 'imx31_init_early':
arch/arm/mach-imx/mm-imx3.c:142:22: warning: assignment from incompatible pointer type [enabled by default] arch/arm/mach-imx/mm-imx3.c: In function 'imx35_init_early':
arch/arm/mach-imx/mm-imx3.c:221:22: warning: assignment from incompatible pointer type [enabled by default]

---
 arch/arm/mach-imx/mm-imx3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/mm-imx3.c +1 -1
index cefa047..f019f14 100644
@@ -65,7 +65,7 @@ static void imx3_idle(void)
 		: "=r" (reg));
 }
 
-static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size,
+static void __iomem *imx3_ioremap_caller(phys_addr_t phys_addr, size_t size,
 					 unsigned int mtype, void *caller)
 {
 	if (mtype == MT_DEVICE) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
Applied
#1 lore raw

PATCH 1/1 ARM: imx: Change type of ioremap function

Quoted 4 lines · Laura Abbott

Commit cd024d4245b2bfbd824b911f11a9756d1d6c167d
(ARM: 7704/1: mm: Use phys_addr_t properly for ioremap functions) changed the type of the ioremap functions to actually use phys_addr_t.

Quoted 8 lines

Switch the imx ioremap functions to use phys_addr_t to avoid warnings:

arch/arm/mach-imx/mm-imx3.c: In function 'imx31_init_early':
arch/arm/mach-imx/mm-imx3.c:142:22: warning: assignment from incompatible pointer type [enabled by default] arch/arm/mach-imx/mm-imx3.c: In function 'imx35_init_early':
arch/arm/mach-imx/mm-imx3.c:221:22: warning: assignment from incompatible pointer type [enabled by default]

Applied, thanks.

Quoted 21 lines
---
 arch/arm/mach-imx/mm-imx3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/mm-imx3.c +1 -1
index cefa047..f019f14 100644
@@ -65,7 +65,7 @@ static void imx3_idle(void)
 		: "=r" (reg));
 }
 
-static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size,
+static void __iomem *imx3_ioremap_caller(phys_addr_t phys_addr, size_t size,
 					 unsigned int mtype, void *caller)
 {
 	if (mtype == MT_DEVICE) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation