[PATCH][v3] powerpc/lib: remove memcpy_flushcache redundant return

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE2246d LANDED

Landed in mainline as e28026189705 on 2020-07-26.

2 messages, 2 authors, 2020-07-27 · open the first message on its own page

[PATCH][v3] powerpc/lib: remove memcpy_flushcache redundant return

From: Li RongQing <hidden>
Date: 2019-04-26 11:38:33

Align it with other architectures and none of the callers has
been interested its return

Signed-off-by: Li RongQing <redacted>
---
v2->v3: remove  extern from declaration
v1->v2: change memcpy_flushcache declaration in arch/powerpc/include/asm/string.h

 arch/powerpc/include/asm/string.h | 2 +-
 arch/powerpc/lib/pmem.c           | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index 1647de15a31e..50392b5086ec 100644
--- a/arch/powerpc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
@@ -25,7 +25,7 @@ extern void * memcpy(void *,const void *,__kernel_size_t);
 extern void * memmove(void *,const void *,__kernel_size_t);
 extern int memcmp(const void *,const void *,__kernel_size_t);
 extern void * memchr(const void *,int,__kernel_size_t);
-extern void * memcpy_flushcache(void *,const void *,__kernel_size_t);
+void memcpy_flushcache(void *dest, const void *src, size_t size);
 
 #ifdef CONFIG_PPC64
 #define __HAVE_ARCH_MEMSET32
diff --git a/arch/powerpc/lib/pmem.c b/arch/powerpc/lib/pmem.c
index 53c018762e1c..a7a1b3fc6720 100644
--- a/arch/powerpc/lib/pmem.c
+++ b/arch/powerpc/lib/pmem.c
@@ -48,14 +48,12 @@ long __copy_from_user_flushcache(void *dest, const void __user *src,
 	return copied;
 }
 
-void *memcpy_flushcache(void *dest, const void *src, size_t size)
+void memcpy_flushcache(void *dest, const void *src, size_t size)
 {
 	unsigned long start = (unsigned long) dest;
 
 	memcpy(dest, src, size);
 	flush_inval_dcache_range(start, start + size);
-
-	return dest;
 }
 EXPORT_SYMBOL(memcpy_flushcache);
 
-- 
2.16.2

Re: [PATCH][v3] powerpc/lib: remove memcpy_flushcache redundant return

From: Michael Ellerman <hidden>
Date: 2020-07-27 07:40:36

On Fri, 26 Apr 2019 19:36:30 +0800, Li RongQing wrote:
Align it with other architectures and none of the callers has
been interested its return
Applied to powerpc/next.

[1/1] powerpc/lib: remove memcpy_flushcache redundant return
      https://git.kernel.org/powerpc/c/e2802618970566277cf5cf5c99df66f21ee83766

cheers
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help