Patchwork ARM: imx: Change type of ioremap function

login
register
mail settings
Submitter Laura Abbott
Date May 1, 2013, 5 p.m.
Message ID <1367427653-6068-1-git-send-email-lauraa@codeaurora.org>
Download mbox | patch
Permalink /patch/240791/
State New
Headers show

Comments

Laura Abbott - May 1, 2013, 5 p.m.
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]

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
---
 arch/arm/mach-imx/mm-imx3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Shawn Guo - May 2, 2013, 5:44 a.m.
On Wed, May 01, 2013 at 10:00:53AM -0700, Laura Abbott wrote:
> 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]
> 
> Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Applied, thanks.

> ---
>  arch/arm/mach-imx/mm-imx3.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
> index cefa047..f019f14 100644
> --- a/arch/arm/mach-imx/mm-imx3.c
> +++ b/arch/arm/mach-imx/mm-imx3.c
> @@ -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) {
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>

Patch

diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index cefa047..f019f14 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -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) {