1 files changed, 14 insertions, 16 deletions

diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index 4e44bee4c564..4bd4db8c84c9 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -41,7 +41,7 @@
 #include "ubi-media.h"
 
 #define err_msg(fmt, ...)                                   \
-        printk(KERN_DEBUG "gluebi (pid %d): %s: " fmt "\n", \
+        pr_err("gluebi (pid %d): %s: " fmt "\n",            \
                current->pid, __func__, ##__VA_ARGS__)
 
 /**
@@ -341,9 +341,8 @@ static int gluebi_create(struct ubi_device_info *di,
         mutex_lock(&devices_mutex);
         g = find_gluebi_nolock(vi->ubi_num, vi->vol_id);
         if (g)
-                err_msg("gluebi MTD device %d form UBI device %d volume %d "
-                        "already exists", g->mtd.index, vi->ubi_num,
-                        vi->vol_id);
+                err_msg("gluebi MTD device %d form UBI device %d volume %d already exists",
+                        g->mtd.index, vi->ubi_num, vi->vol_id);
         mutex_unlock(&devices_mutex);
 
         if (mtd_device_register(mtd, NULL, 0)) {
@@ -376,8 +375,8 @@ static int gluebi_remove(struct ubi_volume_info *vi)
         mutex_lock(&devices_mutex);
         gluebi = find_gluebi_nolock(vi->ubi_num, vi->vol_id);
         if (!gluebi) {
-                err_msg("got remove notification for unknown UBI device %d "
-                        "volume %d", vi->ubi_num, vi->vol_id);
+                err_msg("got remove notification for unknown UBI device %d volume %d",
+                        vi->ubi_num, vi->vol_id);
                 err = -ENOENT;
         } else if (gluebi->refcnt)
                 err = -EBUSY;
@@ -390,9 +389,8 @@ static int gluebi_remove(struct ubi_volume_info *vi)
         mtd = &gluebi->mtd;
         err = mtd_device_unregister(mtd);
         if (err) {
-                err_msg("cannot remove fake MTD device %d, UBI device %d, "
-                        "volume %d, error %d", mtd->index, gluebi->ubi_num,
-                        gluebi->vol_id, err);
+                err_msg("cannot remove fake MTD device %d, UBI device %d, volume %d, error %d",
+                        mtd->index, gluebi->ubi_num, gluebi->vol_id, err);
                 mutex_lock(&devices_mutex);
                 list_add_tail(&gluebi->list, &gluebi_devices);
                 mutex_unlock(&devices_mutex);
@@ -422,8 +420,8 @@ static int gluebi_updated(struct ubi_volume_info *vi)
         gluebi = find_gluebi_nolock(vi->ubi_num, vi->vol_id);
         if (!gluebi) {
                 mutex_unlock(&devices_mutex);
-                err_msg("got update notification for unknown UBI device %d "
-                        "volume %d", vi->ubi_num, vi->vol_id);
+                err_msg("got update notification for unknown UBI device %d volume %d",
+                        vi->ubi_num, vi->vol_id);
                 return -ENOENT;
         }
 
@@ -449,8 +447,8 @@ static int gluebi_resized(struct ubi_volume_info *vi)
         gluebi = find_gluebi_nolock(vi->ubi_num, vi->vol_id);
         if (!gluebi) {
                 mutex_unlock(&devices_mutex);
-                err_msg("got update notification for unknown UBI device %d "
-                        "volume %d", vi->ubi_num, vi->vol_id);
+                err_msg("got update notification for unknown UBI device %d volume %d",
+                        vi->ubi_num, vi->vol_id);
                 return -ENOENT;
         }
         gluebi->mtd.size = vi->used_bytes;
@@ -507,9 +505,9 @@ static void __exit ubi_gluebi_exit(void)
 
                 err = mtd_device_unregister(mtd);
                 if (err)
-                        err_msg("error %d while removing gluebi MTD device %d, "
-                                "UBI device %d, volume %d - ignoring", err,
-                                mtd->index, gluebi->ubi_num, gluebi->vol_id);
+                        err_msg("error %d while removing gluebi MTD device %d, UBI device %d, volume %d - ignoring",
+                                err, mtd->index, gluebi->ubi_num,
+                                gluebi->vol_id);
                 kfree(mtd->name);
                 kfree(gluebi);
         }