s390: Use pr_warn instead of pr_warning

[cascardo/linux.git] / drivers / s390 / block / dasd_diag.c

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 38c5c6f..bb2d26a 100644 (file)
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -144,14 +144,13 @@ dasd_diag_erp(struct dasd_device *device)
        rc = mdsk_init_io(device, device->block->bp_block, 0, NULL);
        if (rc == 4) {
                if (!(test_and_set_bit(DASD_FLAG_DEVICE_RO, &device->flags)))
-                       pr_warning("%s: The access mode of a DIAG device "
-                                  "changed to read-only\n",
-                                  dev_name(&device->cdev->dev));
+                       pr_warn("%s: The access mode of a DIAG device changed to read-only\n",
+                               dev_name(&device->cdev->dev));
                rc = 0;
        }
        if (rc)
-               pr_warning("%s: DIAG ERP failed with "
-                           "rc=%d\n", dev_name(&device->cdev->dev), rc);
+               pr_warn("%s: DIAG ERP failed with rc=%d\n",
+                       dev_name(&device->cdev->dev), rc);
 }
 
 /* Start a given request at the device. Return zero on success, non-zero
@@ -367,9 +366,9 @@ dasd_diag_check_device(struct dasd_device *device)
                private->pt_block = 2;
                break;
        default:
-               pr_warning("%s: Device type %d is not supported "
-                          "in DIAG mode\n", dev_name(&device->cdev->dev),
-                          private->rdc_data.vdev_class);
+               pr_warn("%s: Device type %d is not supported in DIAG mode\n",
+                       dev_name(&device->cdev->dev),
+                       private->rdc_data.vdev_class);
                rc = -EOPNOTSUPP;
                goto out;
        }
@@ -410,8 +409,8 @@ dasd_diag_check_device(struct dasd_device *device)
                private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
                rc = dia250(&private->iob, RW_BIO);
                if (rc == 3) {
-                       pr_warning("%s: A 64-bit DIAG call failed\n",
-                                  dev_name(&device->cdev->dev));
+                       pr_warn("%s: A 64-bit DIAG call failed\n",
+                               dev_name(&device->cdev->dev));
                        rc = -EOPNOTSUPP;
                        goto out_label;
                }
@@ -420,9 +419,8 @@ dasd_diag_check_device(struct dasd_device *device)
                        break;
        }
        if (bsize > PAGE_SIZE) {
-               pr_warning("%s: Accessing the DASD failed because of an "
-                          "incorrect format (rc=%d)\n",
-                          dev_name(&device->cdev->dev), rc);
+               pr_warn("%s: Accessing the DASD failed because of an incorrect format (rc=%d)\n",
+                       dev_name(&device->cdev->dev), rc);
                rc = -EIO;
                goto out_label;
        }
@@ -440,8 +438,8 @@ dasd_diag_check_device(struct dasd_device *device)
                block->s2b_shift++;
        rc = mdsk_init_io(device, block->bp_block, 0, NULL);
        if (rc && (rc != 4)) {
-               pr_warning("%s: DIAG initialization failed with rc=%d\n",
-                          dev_name(&device->cdev->dev), rc);
+               pr_warn("%s: DIAG initialization failed with rc=%d\n",
+                       dev_name(&device->cdev->dev), rc);
                rc = -EIO;
        } else {
                if (rc == 4)