summaryrefslogtreecommitdiffstats
path: root/drivers/s390/block/dasd_ioctl.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-03-03 20:49:57 -0800
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-03-07 13:12:04 +0100
commitbaebc70a4db86515d55ff1f226088a8e7f5821a0 (patch)
tree191bc34400c2fcbd5efebb97cb015caf9cec7bcf /drivers/s390/block/dasd_ioctl.c
parent543691a4e1e040300ce6598a6ce6527d3144e5db (diff)
downloadlinux-baebc70a4db86515d55ff1f226088a8e7f5821a0.tar.bz2
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_ioctl.c')
-rw-r--r--drivers/s390/block/dasd_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 16bb5ec4b30b..90f30cc31561 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -265,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;
}