| Message ID | 1312988619-16804-3-git-send-email-catalin.marinas@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 10, 2011 at 04:03:25PM +0100, Catalin Marinas wrote: > This is to avoid a compiler warning when invoking the __bus_to_virt() > macro. The dma_to_virt() function gets addresses within the 32-bit > range. Ok.
On Sat, Aug 13, 2011 at 03:33:58PM +0100, Russell King - ARM Linux wrote: > On Wed, Aug 10, 2011 at 04:03:25PM +0100, Catalin Marinas wrote: > > This is to avoid a compiler warning when invoking the __bus_to_virt() > > macro. The dma_to_virt() function gets addresses within the 32-bit > > range. > > Ok. I haven't noticed anything happening with this patch yet...
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 7a21d0b..28b7ee8 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -32,7 +32,7 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) { - return (void *)__bus_to_virt(addr); + return (void *)__bus_to_virt((unsigned long)addr); } static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
This is to avoid a compiler warning when invoking the __bus_to_virt() macro. The dma_to_virt() function gets addresses within the 32-bit range. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/include/asm/dma-mapping.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)