From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: Re: [PATCH] ARM: msm: Change type of ioremap function Date: Thu, 02 May 2013 10:26:46 -0700 Message-ID: <5182A1D6.7070809@codeaurora.org> References: <1367514708-30868-1-git-send-email-lauraa@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:59445 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759437Ab3EBR0r (ORCPT ); Thu, 2 May 2013 13:26:47 -0400 In-Reply-To: <1367514708-30868-1-git-send-email-lauraa@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Laura Abbott Cc: David Brown , Daniel Walker , linux-arm-msm@vger.kernel.org On 05/02/13 10:11, 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 > instead of unsigned long. Change the type of the arch_ioremap function > to use phys_addr_t as well. > > Signed-off-by: Laura Abbott Acked-by: Stephen Boyd > > diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h > index ce8215a..421cf77 100644 > --- a/arch/arm/mach-msm/common.h > +++ b/arch/arm/mach-msm/common.h > @@ -23,7 +23,7 @@ extern void msm_map_msm8x60_io(void); > extern void msm_map_msm8960_io(void); > extern void msm_map_qsd8x50_io(void); > > -extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, > +extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size, > unsigned int mtype, void *caller); > > extern struct smp_operations msm_smp_ops; > diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c > index 123ef9c..fd65b6d 100644 > --- a/arch/arm/mach-msm/io.c > +++ b/arch/arm/mach-msm/io.c > @@ -172,7 +172,7 @@ void __init msm_map_msm7x30_io(void) > } > #endif /* CONFIG_ARCH_MSM7X30 */ > > -void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, > +void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size, > unsigned int mtype, void *caller) > { > if (mtype == MT_DEVICE) { -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation