sh: Remove memset_io from sh specific code

Commit Message

Julian Vetter Dec. 4, 2024, 4:40 p.m. UTC

Remove memset_io from sh specific code and fall back to the new
implementation from lib/iomem_copy.c. It uses word accesses if the
buffer is aligned and only falls back to byte accesses for potentially
unaligned parts of a buffer (i.e., at the beginning and end).

Signed-off-by: Julian Vetter <[e-mail]>
---
 arch/sh/include/asm/io.h |  2 --
 arch/sh/kernel/io.c      | 14 --------------
 2 files changed, 16 deletions(-)

Patch

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index cf5eab840d57..3771bfa984af 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -269,12 +269,10 @@  __BUILD_IOPORT_STRING(q, u64)
 #define IO_SPACE_LIMIT 0xffffffff
 
 /* We really want to try and get these to memcpy etc */
-#define memset_io memset_io
 #define memcpy_fromio memcpy_fromio
 #define memcpy_toio memcpy_toio
 void memcpy_fromio(void *, const volatile void __iomem *, unsigned long);
 void memcpy_toio(volatile void __iomem *, const void *, unsigned long);
-void memset_io(volatile void __iomem *, int, unsigned long);
 
 /* Quad-word real-mode I/O, don't ask.. */
 unsigned long long peek_real_address_q(unsigned long long addr);
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index da22f3b32d30..16e963bab595 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -95,17 +95,3 @@  void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long coun
 	mb();
 }
 EXPORT_SYMBOL(memcpy_toio);
-
-/*
- * "memset" on IO memory space.
- * This needs to be optimized.
- */
-void memset_io(volatile void __iomem *dst, int c, unsigned long count)
-{
-        while (count) {
-                count--;
-                writeb(c, dst);
-                dst++;
-        }
-}
-EXPORT_SYMBOL(memset_io);