From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 6 Nov 2024 06:10:50 +0000 (+0000)
Subject: asm/vga.h: don't bother with scr_mem{cpy,move}v() unless we need to
X-Git-Tag: v6.13-rc1~141^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a36498d22c2b9ae8fda4e1c9e01c04897b1fd6d0;p=thirdparty%2Fkernel%2Flinux.git

asm/vga.h: don't bother with scr_mem{cpy,move}v() unless we need to

... if they are identical to fallbacks, just leave them alone.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/mips/include/asm/vga.h b/arch/mips/include/asm/vga.h
index 0136e03666989..491c2b5aeb816 100644
--- a/arch/mips/include/asm/vga.h
+++ b/arch/mips/include/asm/vga.h
@@ -47,10 +47,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int count)
 	memset16(s, cpu_to_le16(v), count / 2);
 }
 
-#define scr_memcpyw(d, s, c) memcpy(d, s, c)
-#define scr_memmovew(d, s, c) memmove(d, s, c)
-#define VT_BUF_HAVE_MEMCPYW
-#define VT_BUF_HAVE_MEMMOVEW
 #define VT_BUF_HAVE_MEMSETW
 
 #endif /* _ASM_VGA_H */
diff --git a/arch/powerpc/include/asm/vga.h b/arch/powerpc/include/asm/vga.h
index fcf721682a711..f2dc40e1c52ae 100644
--- a/arch/powerpc/include/asm/vga.h
+++ b/arch/powerpc/include/asm/vga.h
@@ -40,11 +40,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int n)
 	memset16(s, cpu_to_le16(v), n / 2);
 }
 
-#define VT_BUF_HAVE_MEMCPYW
-#define VT_BUF_HAVE_MEMMOVEW
-#define scr_memcpyw	memcpy
-#define scr_memmovew	memmove
-
 #endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */
 
 #ifdef __powerpc64__
diff --git a/arch/sparc/include/asm/vga.h b/arch/sparc/include/asm/vga.h
index 2952d667d9363..cc2bc60b4c8ba 100644
--- a/arch/sparc/include/asm/vga.h
+++ b/arch/sparc/include/asm/vga.h
@@ -14,8 +14,6 @@
 
 #define VT_BUF_HAVE_RW
 #define VT_BUF_HAVE_MEMSETW
-#define VT_BUF_HAVE_MEMCPYW
-#define VT_BUF_HAVE_MEMMOVEW
 
 #undef scr_writew
 #undef scr_readw
@@ -41,20 +39,6 @@ static inline void scr_memsetw(u16 *p, u16 v, unsigned int n)
 	memset16(p, cpu_to_le16(v), n / 2);
 }
 
-static inline void scr_memcpyw(u16 *d, u16 *s, unsigned int n)
-{
-	BUG_ON((long) d >= 0);
-
-	memcpy(d, s, n);
-}
-
-static inline void scr_memmovew(u16 *d, u16 *s, unsigned int n)
-{
-	BUG_ON((long) d >= 0);
-
-	memmove(d, s, n);
-}
-
 #define VGA_MAP_MEM(x,s) (x)
 
 #endif