Commit 46e13d2a authored by Russell King's avatar Russell King

[ARM] Correct dma_to_virt()/virt_to_dma() return types.

parent 8b6c83d3
...@@ -186,8 +186,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x) ...@@ -186,8 +186,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
*/ */
#ifndef __arch_page_to_dma #ifndef __arch_page_to_dma
#define page_to_dma(dev, page) ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page))) #define page_to_dma(dev, page) ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page)))
#define dma_to_virt(dev, addr) (__bus_to_virt(addr)) #define dma_to_virt(dev, addr) ((void *)__bus_to_virt(addr))
#define virt_to_dma(dev, addr) (__virt_to_bus((unsigned long)(addr))) #define virt_to_dma(dev, addr) ((dma_addr_t)__virt_to_bus((unsigned long)(addr)))
#else #else
#define page_to_dma(dev, page) (__arch_page_to_dma(dev, page)) #define page_to_dma(dev, page) (__arch_page_to_dma(dev, page))
#define dma_to_virt(dev, addr) (__arch_dma_to_virt(dev, addr)) #define dma_to_virt(dev, addr) (__arch_dma_to_virt(dev, addr))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment