s390: Use pr_warn instead of pr_warning

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

diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 02837d0..90f30cc 100644 (file)
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -203,9 +203,7 @@ static int
 dasd_format(struct dasd_block *block, struct format_data_t *fdata)
 {
        struct dasd_device *base;
-       int enable_pav = 1;
-       int rc, retries;
-       int start, stop;
+       int rc;
 
        base = block->base;
        if (base->discipline->format_device == NULL)
@@ -233,30 +231,11 @@ dasd_format(struct dasd_block *block, struct format_data_t *fdata)
                bdput(bdev);
        }
 
-       retries = 255;
-       /* backup start- and endtrack for retries */
-       start = fdata->start_unit;
-       stop = fdata->stop_unit;
-       do {
-               rc = base->discipline->format_device(base, fdata, enable_pav);
-               if (rc) {
-                       if (rc == -EAGAIN) {
-                               retries--;
-                               /* disable PAV in case of errors */
-                               enable_pav = 0;
-                               fdata->start_unit = start;
-                               fdata->stop_unit = stop;
-                       } else
-                               return rc;
-               } else
-                       /* success */
-                       break;
-       } while (retries);
-
-       if (!retries)
-               return -EIO;
-       else
-               return 0;
+       rc = base->discipline->format_device(base, fdata, 1);
+       if (rc == -EAGAIN)
+               rc = base->discipline->format_device(base, fdata, 0);
+
+       return rc;
 }
 
 /*
@@ -286,9 +265,8 @@ dasd_ioctl_format(struct block_device *bdev, void __user *argp)
                return -EFAULT;
        }
        if (bdev != bdev->bd_contains) {
-               pr_warning("%s: The specified DASD is a partition and cannot "
-                          "be formatted\n",
-                          dev_name(&base->cdev->dev));
+               pr_warn("%s: The specified DASD is a partition and cannot be formatted\n",
+                       dev_name(&base->cdev->dev));
                dasd_put_device(base);
                return -EINVAL;
        }