diff options
author | Joe Perches <joe@perches.com> | 2016-03-03 23:49:57 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-03-07 07:12:04 -0500 |
commit | baebc70a4db86515d55ff1f226088a8e7f5821a0 (patch) | |
tree | 191bc34400c2fcbd5efebb97cb015caf9cec7bcf /drivers/s390/block/dasd_devmap.c | |
parent | 543691a4e1e040300ce6598a6ce6527d3144e5db (diff) |
s390: Use pr_warn instead of pr_warning
Convert the uses of pr_warning to pr_warn so there are fewer
uses of the old pr_warning.
Miscellanea:
o Align arguments
o Coalesce formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd_devmap.c')
-rw-r--r-- | drivers/s390/block/dasd_devmap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 8286f742436b..2f18f61092b5 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
@@ -214,8 +214,8 @@ dasd_feature_list(char *str, char **endp) | |||
214 | else if (len == 8 && !strncmp(str, "failfast", 8)) | 214 | else if (len == 8 && !strncmp(str, "failfast", 8)) |
215 | features |= DASD_FEATURE_FAILFAST; | 215 | features |= DASD_FEATURE_FAILFAST; |
216 | else { | 216 | else { |
217 | pr_warning("%*s is not a supported device option\n", | 217 | pr_warn("%*s is not a supported device option\n", |
218 | len, str); | 218 | len, str); |
219 | rc = -EINVAL; | 219 | rc = -EINVAL; |
220 | } | 220 | } |
221 | str += len; | 221 | str += len; |
@@ -224,8 +224,7 @@ dasd_feature_list(char *str, char **endp) | |||
224 | str++; | 224 | str++; |
225 | } | 225 | } |
226 | if (*str != ')') { | 226 | if (*str != ')') { |
227 | pr_warning("A closing parenthesis ')' is missing in the " | 227 | pr_warn("A closing parenthesis ')' is missing in the dasd= parameter\n"); |
228 | "dasd= parameter\n"); | ||
229 | rc = -EINVAL; | 228 | rc = -EINVAL; |
230 | } else | 229 | } else |
231 | str++; | 230 | str++; |
@@ -348,8 +347,7 @@ dasd_parse_range( char *parsestring ) { | |||
348 | return str + 1; | 347 | return str + 1; |
349 | if (*str == '\0') | 348 | if (*str == '\0') |
350 | return str; | 349 | return str; |
351 | pr_warning("The dasd= parameter value %s has an invalid ending\n", | 350 | pr_warn("The dasd= parameter value %s has an invalid ending\n", str); |
352 | str); | ||
353 | return ERR_PTR(-EINVAL); | 351 | return ERR_PTR(-EINVAL); |
354 | } | 352 | } |
355 | 353 | ||