9 files changed, 101 insertions, 113 deletions

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 68d4d1f76d1e..d8e92b6a33f6 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -378,8 +378,8 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
                         if (err == UBI_IO_BITFLIPS)
                                 bitflips = 1;
                         else {
-                                ubi_err("VID of PEB %d header is bad, but it "
-                                        "was OK earlier, err %d", pnum, err);
+                                ubi_err("VID of PEB %d header is bad, but it was OK earlier, err %d",
+                                        pnum, err);
                                 if (err > 0)
                                         err = -EIO;
 
@@ -790,9 +790,9 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
         if (ubi_check_pattern(ubi->peb_buf, 0xFF, ubi->leb_size))
                 goto out_unlock;
 
-        ubi_err("PEB %d contains corrupted VID header, and the data does not "
-                "contain all 0xFF, this may be a non-UBI PEB or a severe VID "
-                "header corruption which requires manual inspection", pnum);
+        ubi_err("PEB %d contains corrupted VID header, and the data does not contain all 0xFF",
+                pnum);
+        ubi_err("this may be a non-UBI PEB or a severe VID header corruption which requires manual inspection");
         ubi_dump_vid_hdr(vid_hdr);
         dbg_msg("hexdump of PEB %d offset %d, length %d",
                 pnum, ubi->leb_start, ubi->leb_size);
@@ -907,8 +907,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                         ubi->image_seq = image_seq;
                 if (ubi->image_seq && image_seq &&
                     ubi->image_seq != image_seq) {
-                        ubi_err("bad image sequence number %d in PEB %d, "
-                                "expected %d", image_seq, pnum, ubi->image_seq);
+                        ubi_err("bad image sequence number %d in PEB %d, expected %d",
+                                image_seq, pnum, ubi->image_seq);
                         ubi_dump_ec_hdr(ech);
                         return -EINVAL;
                 }
@@ -997,8 +997,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                 /* Unsupported internal volume */
                 switch (vidh->compat) {
                 case UBI_COMPAT_DELETE:
-                        ubi_msg("\"delete\" compatible internal volume %d:%d"
-                                " found, will remove it", vol_id, lnum);
+                        ubi_msg("\"delete\" compatible internal volume %d:%d found, will remove it",
+                                vol_id, lnum);
                         err = add_to_list(ai, pnum, vol_id, lnum,
                                           ec, 1, &ai->erase);
                         if (err)
@@ -1006,15 +1006,14 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                         return 0;
 
                 case UBI_COMPAT_RO:
-                        ubi_msg("read-only compatible internal volume %d:%d"
-                                " found, switch to read-only mode",
+                        ubi_msg("read-only compatible internal volume %d:%d found, switch to read-only mode",
                                 vol_id, lnum);
                         ubi->ro_mode = 1;
                         break;
 
                 case UBI_COMPAT_PRESERVE:
-                        ubi_msg("\"preserve\" compatible internal volume %d:%d"
-                                " found", vol_id, lnum);
+                        ubi_msg("\"preserve\" compatible internal volume %d:%d found",
+                                vol_id, lnum);
                         err = add_to_list(ai, pnum, vol_id, lnum,
                                           ec, 0, &ai->alien);
                         if (err)
@@ -1112,8 +1111,7 @@ static int late_analysis(struct ubi_device *ubi, struct ubi_attach_info *ai)
                         get_random_bytes(&ubi->image_seq,
                                          sizeof(ubi->image_seq));
                 } else {
-                        ubi_err("MTD device is not UBI-formatted and possibly "
-                                "contains non-UBI data - refusing it");
+                        ubi_err("MTD device is not UBI-formatted and possibly contains non-UBI data - refusing it");
                         return -EINVAL;
                 }
 
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 89660881aa31..dd9bc0a5cc31 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -748,16 +748,15 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024)
          * read-only mode.
          */
         if (ubi->vid_hdr_offset + UBI_VID_HDR_SIZE <= ubi->hdrs_min_io_size) {
-                ubi_warn("EC and VID headers are in the same minimal I/O unit, "
-                         "switch to read-only mode");
+                ubi_warn("EC and VID headers are in the same minimal I/O unit, switch to read-only mode");
                 ubi->ro_mode = 1;
         }
 
         ubi->leb_size = ubi->peb_size - ubi->leb_start;
 
         if (!(ubi->mtd->flags & MTD_WRITEABLE)) {
-                ubi_msg("MTD device %d is write-protected, attach in "
-                        "read-only mode", ubi->mtd->index);
+                ubi_msg("MTD device %d is write-protected, attach in read-only mode",
+                        ubi->mtd->index);
                 ubi->ro_mode = 1;
         }
 
@@ -892,8 +891,8 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
          * no sense to attach emulated MTD devices, so we prohibit this.
          */
         if (mtd->type == MTD_UBIVOLUME) {
-                ubi_err("refuse attaching mtd%d - it is already emulated on "
-                        "top of UBI", mtd->index);
+                ubi_err("refuse attaching mtd%d - it is already emulated on top of UBI",
+                        mtd->index);
                 return -EINVAL;
         }
 
@@ -1357,14 +1356,13 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
 
         len = strnlen(val, MTD_PARAM_LEN_MAX);
         if (len == MTD_PARAM_LEN_MAX) {
-                printk(KERN_ERR "UBI error: parameter \"%s\" is too long, "
-                       "max. is %d\n", val, MTD_PARAM_LEN_MAX);
+                printk(KERN_ERR "UBI error: parameter \"%s\" is too long, max. is %d\n",
+                       val, MTD_PARAM_LEN_MAX);
                 return -EINVAL;
         }
 
         if (len == 0) {
-                printk(KERN_WARNING "UBI warning: empty 'mtd=' parameter - "
-                       "ignored\n");
+                printk(KERN_WARNING "UBI warning: empty 'mtd=' parameter - ignored\n");
                 return 0;
         }
 
@@ -1396,8 +1394,8 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
                 int err = kstrtoint(tokens[2], 10, &p->max_beb_per1024);
 
                 if (err) {
-                        printk(KERN_ERR "UBI error: bad value for "
-                               "max_beb_per1024 parameter: %s", tokens[2]);
+                        printk(KERN_ERR "UBI error: bad value for max_beb_per1024 parameter: %s",
+                               tokens[2]);
                         return -EINVAL;
                 }
         }
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 7885dc0934ce..540d2db492ee 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -140,9 +140,9 @@ static int vol_cdev_release(struct inode *inode, struct file *file)
                 vol->updating = 0;
                 vfree(vol->upd_buf);
         } else if (vol->changing_leb) {
-                dbg_gen("only %lld of %lld bytes received for atomic LEB change"
-                        " for volume %d:%d, cancel", vol->upd_received,
+                dbg_gen("only %lld of %lld bytes received for atomic LEB change for volume %d:%d, cancel",
+                        vol->u