3 files changed, 6 insertions, 6 deletions

diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 77df726180ba..2b92d501425f 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -164,7 +164,7 @@ static inline void part_hdr__part_name(enum diag204_format type, void *hdr,
                        LPAR_NAME_LEN);
         EBCASC(name, LPAR_NAME_LEN);
         name[LPAR_NAME_LEN] = 0;
-        strstrip(name);
+        strim(name);
 }
 
 struct cpu_info {
@@ -523,7 +523,7 @@ static int diag224_idx2name(int index, char *name)
         memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN),
                 CPU_NAME_LEN);
         name[CPU_NAME_LEN] = 0;
-        strstrip(name);
+        strim(name);
         return 0;
 }
 
diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index d01fc8f799f0..f0b0d31f0b48 100644
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -124,7 +124,7 @@ static int hpyfs_vm_create_guest(struct super_block *sb,
         /* guest dir */
         memcpy(guest_name, data->guest_name, NAME_LEN);
         EBCASC(guest_name, NAME_LEN);
-        strstrip(guest_name);
+        strim(guest_name);
         guest_dir = hypfs_mkdir(sb, systems_dir, guest_name);
         if (IS_ERR(guest_dir))
                 return PTR_ERR(guest_dir);
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 4890ac6d7faa..4d73296fed74 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -221,7 +221,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj,	\
                 const char *buf, size_t len)                            \
 {                                                                       \
         strncpy(_value, buf, sizeof(_value) - 1);                       \
-        strstrip(_value);                                               \
+        strim(_value);                                                  \
         return len;                                                     \
 }                                                                       \
 static struct kobj_attribute sys_##_prefix##_##_name##_attr =           \
@@ -472,7 +472,7 @@ static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
                 return sprintf(page, "#unknown#\n");
         memcpy(loadparm, &sclp_ipl_info.loadparm, LOADPARM_LEN);
         EBCASC(loadparm, LOADPARM_LEN);
-        strstrip(loadparm);
+        strim(loadparm);
         return sprintf(page, "%s\n", loadparm);
 }
 
@@ -776,7 +776,7 @@ static void reipl_get_ascii_loadparm(char *loadparm,
         memcpy(loadparm, ibp->ipl_info.ccw.load_parm, LOADPARM_LEN);
         EBCASC(loadparm, LOADPARM_LEN);
         loadparm[LOADPARM_LEN] = 0;
-        strstrip(loadparm);
+        strim(loadparm);
 }
 
 static ssize_t reipl_generic_loadparm_show(struct ipl_parameter_block *ipb,