summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSam Hansen <solid.se7en@gmail.com>2012-06-07 16:03:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-11 09:04:14 -0700
commit94b8435ff4d46dde75173da45564b0d65889dc64 (patch)
treef81845e8ba1850df6c9b88d3ca6ebdd851e6073a /drivers
parent2db51dae56240b52fe08ddbb1a2eb47fe7cfd044 (diff)
downloadtalos-op-linux-94b8435ff4d46dde75173da45564b0d65889dc64.tar.gz
talos-op-linux-94b8435ff4d46dde75173da45564b0d65889dc64.zip
staging: zram: conventions pr_warning -> pr_warn()
Porting zram to use the pr_warn() function instead of the deprecated pr_warning(). Signed-off-by: Sam Hansen <solid.se7en@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/zram/zram_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 2036a901628b..706cb625aae9 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -645,7 +645,7 @@ static int create_device(struct zram *zram, int device_id)
zram->disk = alloc_disk(1);
if (!zram->disk) {
blk_cleanup_queue(zram->queue);
- pr_warning("Error allocating disk structure for device %d\n",
+ pr_warn("Error allocating disk structure for device %d\n",
device_id);
ret = -ENOMEM;
goto out;
@@ -676,7 +676,7 @@ static int create_device(struct zram *zram, int device_id)
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);
if (ret < 0) {
- pr_warning("Error creating sysfs group");
+ pr_warn("Error creating sysfs group");
goto out;
}
@@ -710,7 +710,7 @@ static int __init zram_init(void)
int ret, dev_id;
if (num_devices > max_num_devices) {
- pr_warning("Invalid value for num_devices: %u\n",
+ pr_warn("Invalid value for num_devices: %u\n",
num_devices);
ret = -EINVAL;
goto out;
@@ -718,7 +718,7 @@ static int __init zram_init(void)
zram_major = register_blkdev(0, "zram");
if (zram_major <= 0) {
- pr_warning("Unable to get major number\n");
+ pr_warn("Unable to get major number\n");
ret = -EBUSY;
goto out;
}
OpenPOWER on IntegriCloud