path: root/arch/nios2/include/asm/io.h
diff options
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-04-18 18:04:55 +0200
committerWill Deacon <will.deacon@arm.com>2016-04-22 10:08:26 +0100
commit046982c760bcbb0d92981a7be577dbc081323a78 (patch)
tree6f804f00cc4183e405691cbda52ac9534ad4be8f /arch/nios2/include/asm/io.h
parentarm64/dma-mapping: Remove default domain workaround (diff)
nios2: use correct void* return type for page_to_virt()
To align with other architectures, the expression produced by expanding the macro page_to_virt() should be of type void*, since it returns a virtual address. Fix that, and also fix up an instance where page_to_virt was expected to return 'unsigned long', and drop another instance that was entirely unused (page_to_bus) Acked-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/nios2/include/asm/io.h')
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index c5a62da22cd2..ce072ba0f8dd 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -50,7 +50,6 @@ static inline void iounmap(void __iomem *addr)
/* Pages to physical address... */
#define page_to_phys(page) virt_to_phys(page_to_virt(page))
-#define page_to_bus(page) page_to_virt(page)
/* Macros used for converting between virtual and physical mappings. */
#define phys_to_virt(vaddr) \