zram: unify error reporting

[firefly-linux-kernel-4.4.55.git] / drivers / block / zram / zram_drv.c

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index f1c4bb34e007e1d0d1105022c305a94cb49c03a7..9fa15bb9d118ee5ad2d9f34e23aab6777d09d105 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -622,7 +622,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
                uncmem = user_mem;
 
        if (!uncmem) {
-               pr_info("Unable to allocate temp memory\n");
+               pr_err("Unable to allocate temp memory\n");
                ret = -ENOMEM;
                goto out_cleanup;
        }
@@ -719,7 +719,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
 
        handle = zs_malloc(meta->mem_pool, clen);
        if (!handle) {
-               pr_info("Error allocating memory for compressed page: %u, size=%zu\n",
+               pr_err("Error allocating memory for compressed page: %u, size=%zu\n",
                        index, clen);
                ret = -ENOMEM;
                goto out;
@@ -1039,7 +1039,7 @@ static ssize_t disksize_store(struct device *dev,
 
        comp = zcomp_create(zram->compressor, zram->max_comp_streams);
        if (IS_ERR(comp)) {
-               pr_info("Cannot initialise %s compressing backend\n",
+               pr_err("Cannot initialise %s compressing backend\n",
                                zram->compressor);
                err = PTR_ERR(comp);
                goto out_free_meta;
@@ -1217,7 +1217,7 @@ static int zram_add(void)
        /* gendisk structure */
        zram->disk = alloc_disk(1);
        if (!zram->disk) {
-               pr_warn("Error allocating disk structure for device %d\n",
+               pr_err("Error allocating disk structure for device %d\n",
                        device_id);
                ret = -ENOMEM;
                goto out_free_queue;
@@ -1266,7 +1266,8 @@ static int zram_add(void)
        ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
                                &zram_disk_attr_group);
        if (ret < 0) {
-               pr_warn("Error creating sysfs group");
+               pr_err("Error creating sysfs group for device %d\n",
+                               device_id);
                goto out_free_disk;
        }
        strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
@@ -1406,13 +1407,13 @@ static int __init zram_init(void)
 
        ret = class_register(&zram_control_class);
        if (ret) {
-               pr_warn("Unable to register zram-control class\n");
+               pr_err("Unable to register zram-control class\n");
                return ret;
        }
 
        zram_major = register_blkdev(0, "zram");
        if (zram_major <= 0) {
-               pr_warn("Unable to get major number\n");
+               pr_err("Unable to get major number\n");
                class_unregister(&zram_control_class);
                return -EBUSY;
        }