diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-12-18 11:43:27 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-18 11:43:33 -0500 |
commit | 1d802e24774c94ec7bdb12b6515226f3341533c1 (patch) | |
tree | 3ef93ce8ed49aedd4feb4c292d9bb4b6284518b2 /arch/s390/hypfs | |
parent | 8bcd9b04fdbab9cee4948501f8862af2a288f1b5 (diff) |
[S390] Use strim instead of strstrip to avoid false warnings.
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/hypfs')
-rw-r--r-- | arch/s390/hypfs/hypfs_diag.c | 4 | ||||
-rw-r--r-- | arch/s390/hypfs/hypfs_vm.c | 2 |
2 files changed, 3 insertions, 3 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, | |||
164 | LPAR_NAME_LEN); | 164 | LPAR_NAME_LEN); |
165 | EBCASC(name, LPAR_NAME_LEN); | 165 | EBCASC(name, LPAR_NAME_LEN); |
166 | name[LPAR_NAME_LEN] = 0; | 166 | name[LPAR_NAME_LEN] = 0; |
167 | strstrip(name); | 167 | strim(name); |
168 | } | 168 | } |
169 | 169 | ||
170 | struct cpu_info { | 170 | struct cpu_info { |
@@ -523,7 +523,7 @@ static int diag224_idx2name(int index, char *name) | |||
523 | memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN), | 523 | memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN), |
524 | CPU_NAME_LEN); | 524 | CPU_NAME_LEN); |
525 | name[CPU_NAME_LEN] = 0; | 525 | name[CPU_NAME_LEN] = 0; |
526 | strstrip(name); | 526 | strim(name); |
527 | return 0; | 527 | return 0; |
528 | } | 528 | } |
529 | 529 | ||
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, | |||
124 | /* guest dir */ | 124 | /* guest dir */ |
125 | memcpy(guest_name, data->guest_name, NAME_LEN); | 125 | memcpy(guest_name, data->guest_name, NAME_LEN); |
126 | EBCASC(guest_name, NAME_LEN); | 126 | EBCASC(guest_name, NAME_LEN); |
127 | strstrip(guest_name); | 127 | strim(guest_name); |
128 | guest_dir = hypfs_mkdir(sb, systems_dir, guest_name); | 128 | guest_dir = hypfs_mkdir(sb, systems_dir, guest_name); |
129 | if (IS_ERR(guest_dir)) | 129 | if (IS_ERR(guest_dir)) |
130 | return PTR_ERR(guest_dir); | 130 | return PTR_ERR(guest_dir); |