Commit fe2726af authored by Olof Johansson's avatar Olof Johansson Committed by Palmer Dabbelt
Browse files

RISC-V: io.h: type fixes for warnings 



include <linux/types.h> for __iomem definition. Also, add volatile to
iounmap() like other architectures have it to avoid "discarding
volatile" warnings from some drivers.

Finally, explicitly promote the base address for INB/OUTB functions to
avoid some old legacy drivers complaining about int-to-ptr promotions.
The drivers are unlikely to work but they're included in allmodconfig
so the warnings are noisy.

Fixes, among other warnings, these with allmodconfig:

../arch/riscv/include/asm/io.h:24:21: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
 extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);

sound/pci/echoaudio/echoaudio.c: In function 'snd_echo_free':
sound/pci/echoaudio/echoaudio.c:1879:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers]

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 5e6f82b0

arch/riscv/include/asm/io.h

+9 −7
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#ifndef _ASM_RISCV_IO_H

#define _ASM_RISCV_IO_H



#include <linux/types.h>



#ifdef CONFIG_MMU



extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);
@@ -32,7 +34,7 @@ extern void __iomem *ioremap(phys_addr_t offset, unsigned long size); 
#define ioremap_wc(addr, size) ioremap((addr), (size))

#define ioremap_wt(addr, size) ioremap((addr), (size))



extern void iounmap(void __iomem *addr);

extern void iounmap(volatile void __iomem *addr);



#endif /* CONFIG_MMU */
@@ -266,9 +268,9 @@ __io_reads_ins(reads, u32, l, __io_br(), __io_ar()) 
__io_reads_ins(ins,  u8, b, __io_pbr(), __io_par())

__io_reads_ins(ins, u16, w, __io_pbr(), __io_par())

__io_reads_ins(ins, u32, l, __io_pbr(), __io_par())

#define insb(addr, buffer, count) __insb((void __iomem *)addr, buffer, count)

#define insw(addr, buffer, count) __insw((void __iomem *)addr, buffer, count)

#define insl(addr, buffer, count) __insl((void __iomem *)addr, buffer, count)

#define insb(addr, buffer, count) __insb((void __iomem *)(long)addr, buffer, count)

#define insw(addr, buffer, count) __insw((void __iomem *)(long)addr, buffer, count)

#define insl(addr, buffer, count) __insl((void __iomem *)(long)addr, buffer, count)



__io_writes_outs(writes,  u8, b, __io_bw(), __io_aw())

__io_writes_outs(writes, u16, w, __io_bw(), __io_aw())
@@ -280,9 +282,9 @@ __io_writes_outs(writes, u32, l, __io_bw(), __io_aw()) 
__io_writes_outs(outs,  u8, b, __io_pbw(), __io_paw())

__io_writes_outs(outs, u16, w, __io_pbw(), __io_paw())

__io_writes_outs(outs, u32, l, __io_pbw(), __io_paw())

#define outsb(addr, buffer, count) __outsb((void __iomem *)addr, buffer, count)

#define outsw(addr, buffer, count) __outsw((void __iomem *)addr, buffer, count)

#define outsl(addr, buffer, count) __outsl((void __iomem *)addr, buffer, count)

#define outsb(addr, buffer, count) __outsb((void __iomem *)(long)addr, buffer, count)

#define outsw(addr, buffer, count) __outsw((void __iomem *)(long)addr, buffer, count)

#define outsl(addr, buffer, count) __outsl((void __iomem *)(long)addr, buffer, count)



#ifdef CONFIG_64BIT

__io_reads_ins(reads, u64, q, __io_br(), __io_ar())

arch/riscv/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ EXPORT_SYMBOL(ioremap); 
 *

 * Caller must ensure there is only one unmapping for the same pointer.

 */

void iounmap(void __iomem *addr)

void iounmap(volatile void __iomem *addr)

{

	vunmap((void *)((unsigned long)addr & PAGE_MASK));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE