powerpc: iomap: add missing const to ioread addr argument
Subsystems (2)
PATCH 1/1 powerpc: iomap: add missing const to ioread addr argument
ioread*() signatures from include/asm-generic/iomap.h and lib/iomap.c have been recently modified to add the missing const qualifier to the addr parameter. This broke the powerpc build which still had ioread*() definitions without the const (conflicting types).
Add const qualifier to ioread*() definitions fromarch/powerpc/kernel/iomap.c.
Signed-off-by Hugo Lefeuvre <[email protected]>
--- arch/powerpc/kernel/iomap.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/powerpc/kernel/iomap.c +14 -14
@@ -15,23 +15,23 @@* Here comes the ppc64 implementation of the IOMAP * interfaces. */ -unsigned int ioread8 (void __iomem *addr) +unsigned int ioread8 (const void __iomem *addr) {return readb (addr); } -unsigned int ioread16 (void __iomem *addr) +unsigned int ioread16 (const void __iomem *addr) {return readw (addr); } -unsigned int ioread16be (void __iomem *addr) +unsigned int ioread16be (const void __iomem *addr) {return readw_be (addr); } -unsigned int ioread32 (void __iomem *addr) +unsigned int ioread32 (const void __iomem *addr) {return readl (addr); } -unsigned int ioread32be (void __iomem *addr) +unsigned int ioread32be (const void __iomem *addr) {return readl_be (addr); }
@@ -41,27 +41,27 @@ EXPORT_SYMBOL(ioread16be);EXPORT_SYMBOL (ioread32);EXPORT_SYMBOL (ioread32be);#ifdef __powerpc64__ -u64 ioread64 (void __iomem *addr) +u64 ioread64 (const void __iomem *addr) {return readq (addr); } -u64 ioread64_lo_hi (void __iomem *addr) +u64 ioread64_lo_hi (const void __iomem *addr) {return readq (addr); } -u64 ioread64_hi_lo (void __iomem *addr) +u64 ioread64_hi_lo (const void __iomem *addr) {return readq (addr); } -u64 ioread64be (void __iomem *addr) +u64 ioread64be (const void __iomem *addr) {return readq_be (addr); } -u64 ioread64be_lo_hi (void __iomem *addr) +u64 ioread64be_lo_hi (const void __iomem *addr) {return readq_be (addr); } -u64 ioread64be_hi_lo (void __iomem *addr) +u64 ioread64be_hi_lo (const void __iomem *addr) {return readq_be (addr); }
@@ -139,15 +139,15 @@ EXPORT_SYMBOL(iowrite64be_hi_lo);* FIXME! We could make these do EEH handling if we really * wanted. Not clear if we do. */ -void ioread8_rep (void __iomem *addr,void *dst,unsigned long count) +void ioread8_rep (const void __iomem *addr,void *dst,unsigned long count) {readsb (addr, dst, count); } -void ioread16_rep (void __iomem *addr,void *dst,unsigned long count) +void ioread16_rep (const void __iomem *addr,void *dst,unsigned long count) {readsw (addr, dst, count); } -void ioread32_rep (void __iomem *addr,void *dst,unsigned long count) +void ioread32_rep (const void __iomem *addr,void *dst,unsigned long count) {readsl (addr, dst, count); }
Signature · 1 line
2.20.1