[PATCH 0/1] s390: Align prototypes of zpci IO memcpy functions

[PATCH 0/1] s390: Align prototypes of zpci IO memcpy functions

[Julian Vetter]

As discussed with Niklas Schnelle, I have dropped all the unnecessary
code from the patch and have just aligned the prototypes with the
generic ones from asm-generic/io.h.

Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
---
Julian Vetter (1):
  s390: Align prototypes of zpci IO memcpy functions

 arch/s390/include/asm/pci_io.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.34.1

[PATCH 1/1] s390: Align prototypes of zpci IO memcpy functions

[Julian Vetter]

The generic memcpy_{from,to}io and memset_io functions have a different
prototype than the zpci_memcpy_{from,to}io and zpci_memset_io functions.
But in driver code zpci functions are used as IO memcpy directly. So,
align their prototypes.

Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
---
 arch/s390/include/asm/pci_io.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h
index 2686bee800e3..43a5ea4ee20f 100644
--- a/arch/s390/include/asm/pci_io.h
+++ b/arch/s390/include/asm/pci_io.h
@@ -143,7 +143,7 @@ static inline int zpci_get_max_io_size(u64 src, u64 dst, int len, int max)
 
 static inline int zpci_memcpy_fromio(void *dst,
 				     const volatile void __iomem *src,
-				     unsigned long n)
+				     size_t n)
 {
 	int size, rc = 0;
 
@@ -162,7 +162,7 @@ static inline int zpci_memcpy_fromio(void *dst,
 }
 
 static inline int zpci_memcpy_toio(volatile void __iomem *dst,
-				   const void *src, unsigned long n)
+				   const void *src, size_t n)
 {
 	int size, rc = 0;
 
@@ -187,7 +187,7 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst,
 }
 
 static inline int zpci_memset_io(volatile void __iomem *dst,
-				 unsigned char val, size_t count)
+				 int val, size_t count)
 {
 	u8 *src = kmalloc(count, GFP_KERNEL);
 	int rc;
-- 
2.34.1

Re: [PATCH 1/1] s390: Align prototypes of zpci IO memcpy functions

[Heiko Carstens]

On Thu, Oct 10, 2024 at 03:01:00PM +0200, Julian Vetter wrote:
> The generic memcpy_{from,to}io and memset_io functions have a different
> prototype than the zpci_memcpy_{from,to}io and zpci_memset_io functions.
> But in driver code zpci functions are used as IO memcpy directly. So,
> align their prototypes.
> 
> Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
> ---
>  arch/s390/include/asm/pci_io.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks!