[PATCH v8 10/14] powerpc: Align prototypes of IO memcpy and memset
From: Julian Vetter <hidden>
Date: 2024-10-08 07:55:04
Also in:
linux-alpha, linux-arch, linux-arm-msm, linux-m68k, linux-s390, linux-sh, linux-sound, linux-um, lkml, loongarch
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
Align the prototypes of the memcpy_{from,to}io and memset_io functions
with the new ones from iomap_copy.c.
Reviewed-by: Yann Sionneau <redacted>
Signed-off-by: Julian Vetter <redacted>
---
Changes for v8:
- New patch
---
arch/powerpc/include/asm/io-defs.h | 6 +++---
arch/powerpc/include/asm/io.h | 6 +++---
arch/powerpc/kernel/io.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/include/asm/io-defs.h b/arch/powerpc/include/asm/io-defs.h
index faf8617cc574..20c3f2671da2 100644
--- a/arch/powerpc/include/asm/io-defs.h
+++ b/arch/powerpc/include/asm/io-defs.h@@ -53,9 +53,9 @@ DEF_PCI_AC_NORET(outsw, (unsigned long p, const void *b, unsigned long c), DEF_PCI_AC_NORET(outsl, (unsigned long p, const void *b, unsigned long c), (p, b, c), pio, p) -DEF_PCI_AC_NORET(memset_io, (PCI_IO_ADDR a, int c, unsigned long n), +DEF_PCI_AC_NORET(memset_io, (PCI_IO_ADDR a, int c, size_t n), (a, c, n), mem, a) -DEF_PCI_AC_NORET(memcpy_fromio, (void *d, const PCI_IO_ADDR s, unsigned long n), +DEF_PCI_AC_NORET(memcpy_fromio, (void *d, const PCI_IO_ADDR s, size_t n), (d, s, n), mem, s) -DEF_PCI_AC_NORET(memcpy_toio, (PCI_IO_ADDR d, const void *s, unsigned long n), +DEF_PCI_AC_NORET(memcpy_toio, (PCI_IO_ADDR d, const void *s, size_t n), (d, s, n), mem, d)
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 52e1b1d15ff6..b41799a1e2a3 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h@@ -246,11 +246,11 @@ extern void _outsl_ns(volatile u32 __iomem *addr, const void *buf, long count); * memset_io, memcpy_toio, memcpy_fromio base implementations are out of line */ -extern void _memset_io(volatile void __iomem *addr, int c, unsigned long n); +extern void _memset_io(volatile void __iomem *addr, int c, size_t n); extern void _memcpy_fromio(void *dest, const volatile void __iomem *src, - unsigned long n); + size_t n); extern void _memcpy_toio(volatile void __iomem *dest, const void *src, - unsigned long n); + size_t n); /* *
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index 6af535905984..e1848184619b 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c@@ -120,7 +120,7 @@ EXPORT_SYMBOL(_outsl_ns); #define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0) notrace void -_memset_io(volatile void __iomem *addr, int c, unsigned long n) +_memset_io(volatile void __iomem *addr, int c, size_t n) { void *p = (void __force *)addr; u32 lc = c;
@@ -148,7 +148,7 @@ _memset_io(volatile void __iomem *addr, int c, unsigned long n) EXPORT_SYMBOL(_memset_io); void _memcpy_fromio(void *dest, const volatile void __iomem *src, - unsigned long n) + size_t n) { void *vsrc = (void __force *) src;
@@ -178,7 +178,7 @@ void _memcpy_fromio(void *dest, const volatile void __iomem *src, } EXPORT_SYMBOL(_memcpy_fromio); -void _memcpy_toio(volatile void __iomem *dest, const void *src, unsigned long n) +void _memcpy_toio(volatile void __iomem *dest, const void *src, size_t n) { void *vdest = (void __force *) dest;
--
2.34.1