]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
s390/pci: Align prototypes of zpci IO memcpy functions
authorJulian Vetter <jvetter@kalrayinc.com>
Thu, 10 Oct 2024 13:01:00 +0000 (15:01 +0200)
committerHeiko Carstens <hca@linux.ibm.com>
Wed, 16 Oct 2024 09:33:06 +0000 (11:33 +0200)
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>
Link: https://lore.kernel.org/r/20241010130100.710005-2-jvetter@kalrayinc.com
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/include/asm/pci_io.h

index 2686bee800e3d5a35f2d4918aac38f4020e0889c..43a5ea4ee20f446028f7b9c7a9595c22919df278 100644 (file)
@@ -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;