aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-26 13:41:48 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-07-22 03:26:18 -0400
commit4ce259664e6a502bf9641c90ac5ec049cae15e2d (patch)
treeb73df50b69a876b4cdba6770ee9fdb500f2a6d08 /drivers/s390
parent7048a2b532912467d776bbc157c80bbdb8795a85 (diff)
s390/dasd: replace pr_warning by pr_warn
Fix checkpatch warning: "WARNING: Prefer pr_warn(... to pr_warning(..." + coalesce formats. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 32650fd0f2f1..baae088d81e2 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3221,8 +3221,8 @@ static void dasd_generic_auto_online(void *data, async_cookie_t cookie)
3221 3221
3222 ret = ccw_device_set_online(cdev); 3222 ret = ccw_device_set_online(cdev);
3223 if (ret) 3223 if (ret)
3224 pr_warning("%s: Setting the DASD online failed with rc=%d\n", 3224 pr_warn("%s: Setting the DASD online failed with rc=%d\n",
3225 dev_name(&cdev->dev), ret); 3225 dev_name(&cdev->dev), ret);
3226} 3226}
3227 3227
3228/* 3228/*
@@ -3319,9 +3319,8 @@ int dasd_generic_set_online(struct ccw_device *cdev,
3319 discipline = base_discipline; 3319 discipline = base_discipline;
3320 if (device->features & DASD_FEATURE_USEDIAG) { 3320 if (device->features & DASD_FEATURE_USEDIAG) {
3321 if (!dasd_diag_discipline_pointer) { 3321 if (!dasd_diag_discipline_pointer) {
3322 pr_warning("%s Setting the DASD online failed because " 3322 pr_warn("%s Setting the DASD online failed because of missing DIAG discipline\n",
3323 "of missing DIAG discipline\n", 3323 dev_name(&cdev->dev));
3324 dev_name(&cdev->dev));
3325 dasd_delete_device(device); 3324 dasd_delete_device(device);
3326 return -ENODEV; 3325 return -ENODEV;
3327 } 3326 }
@@ -3342,9 +3341,8 @@ int dasd_generic_set_online(struct ccw_device *cdev,
3342 /* check_device will allocate block device if necessary */ 3341 /* check_device will allocate block device if necessary */
3343 rc = discipline->check_device(device); 3342 rc = discipline->check_device(device);
3344 if (rc) { 3343 if (rc) {
3345 pr_warning("%s Setting the DASD online with discipline %s " 3344 pr_warn("%s Setting the DASD online with discipline %s failed with rc=%i\n",
3346 "failed with rc=%i\n", 3345 dev_name(&cdev->dev), discipline->name, rc);
3347 dev_name(&cdev->dev), discipline->name, rc);
3348 module_put(discipline->owner); 3346 module_put(discipline->owner);
3349 module_put(base_discipline->owner); 3347 module_put(base_discipline->owner);
3350 dasd_delete_device(device); 3348 dasd_delete_device(device);
@@ -3353,8 +3351,8 @@ int dasd_generic_set_online(struct ccw_device *cdev,
3353 3351
3354 dasd_set_target_state(device, DASD_STATE_ONLINE); 3352 dasd_set_target_state(device, DASD_STATE_ONLINE);
3355 if (device->state <= DASD_STATE_KNOWN) { 3353 if (device->state <= DASD_STATE_KNOWN) {
3356 pr_warning("%s Setting the DASD online failed because of a " 3354 pr_warn("%s Setting the DASD online failed because of a missing discipline\n",
3357 "missing discipline\n", dev_name(&cdev->dev)); 3355 dev_name(&cdev->dev));
3358 rc = -ENODEV; 3356 rc = -ENODEV;
3359 dasd_set_target_state(device, DASD_STATE_NEW); 3357 dasd_set_target_state(device, DASD_STATE_NEW);
3360 if (device->block) 3358 if (device->block)
@@ -3393,13 +3391,11 @@ int dasd_generic_set_offline(struct ccw_device *cdev)
3393 open_count = atomic_read(&device->block->open_count); 3391 open_count = atomic_read(&device->block->open_count);
3394 if (open_count > max_count) { 3392 if (open_count > max_count) {
3395 if (open_count > 0) 3393 if (open_count > 0)
3396 pr_warning("%s: The DASD cannot be set offline " 3394 pr_warn("%s: The DASD cannot be set offline with open count %i\n",
3397 "with open count %i\n", 3395 dev_name(&cdev->dev), open_count);
3398 dev_name(&cdev->dev), open_count);
3399 else 3396 else
3400 pr_warning("%s: The DASD cannot be set offline " 3397 pr_warn("%s: The DASD cannot be set offline while it is in use\n",
3401 "while it is in use\n", 3398 dev_name(&cdev->dev));
3402 dev_name(&cdev->dev));
3403 clear_bit(DASD_FLAG_OFFLINE, &device->flags); 3399 clear_bit(DASD_FLAG_OFFLINE, &device->flags);
3404 dasd_put_device(device); 3400 dasd_put_device(device);
3405 return -EBUSY; 3401 return -EBUSY;