2 files changed, 6 insertions, 4 deletions

diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c
index 9103652058c4..5a0281c81edf 100644
--- a/arch/x86/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
@@ -285,7 +285,7 @@ static void putstr(const char *s)
 static void* memset(void* s, int c, unsigned n)
 {
         int i;
-        char *ss = (char*)s;
+        char *ss = s;
 
         for (i=0;i<n;i++) ss[i] = c;
         return s;
@@ -294,7 +294,8 @@ static void* memset(void* s, int c, unsigned n)
 static void* memcpy(void* dest, const void* src, unsigned n)
 {
         int i;
-        char *d = (char *)dest, *s = (char *)src;
+        const char *s = src;
+        char *d = dest;
 
         for (i=0;i<n;i++) d[i] = s[i];
         return dest;
diff --git a/arch/x86/boot/compressed/misc_64.c b/arch/x86/boot/compressed/misc_64.c
index 8494f0dcff21..8c1573b5d6c7 100644
--- a/arch/x86/boot/compressed/misc_64.c
+++ b/arch/x86/boot/compressed/misc_64.c
@@ -284,7 +284,7 @@ static void putstr(const char *s)
 static void* memset(void* s, int c, unsigned n)
 {
         int i;
-        char *ss = (char*)s;
+        char *ss = s;
 
         for (i=0;i<n;i++) ss[i] = c;
         return s;
@@ -293,7 +293,8 @@ static void* memset(void* s, int c, unsigned n)
 static void* memcpy(void* dest, const void* src, unsigned n)
 {
         int i;
-        char *d = (char *)dest, *s = (char *)src;
+        const char *s = src;
+        char *d = dest;
 
         for (i=0;i<n;i++) d[i] = s[i];
         return dest;