1 files changed, 27 insertions, 26 deletions

diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 2402d3b50171..a40020cf0923 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -422,7 +422,7 @@ retry:
                                  */
                                 if (err == UBI_IO_BAD_HDR_EBADMSG ||
                                     err == UBI_IO_BAD_HDR) {
-                                        ubi_warn("corrupted VID header at PEB %d, LEB %d:%d",
+                                        ubi_warn(ubi, "corrupted VID header at PEB %d, LEB %d:%d",
                                                  pnum, vol_id, lnum);
                                         err = -EBADMSG;
                                 } else
@@ -448,7 +448,7 @@ retry:
                                 goto out_unlock;
                         scrub = 1;
                         if (!check) {
-                                ubi_msg("force data checking");
+                                ubi_msg(ubi, "force data checking");
                                 check = 1;
                                 goto retry;
                         }
@@ -459,7 +459,7 @@ retry:
         if (check) {
                 uint32_t crc1 = crc32(UBI_CRC32_INIT, buf, len);
                 if (crc1 != crc) {
-                        ubi_warn("CRC error: calculated %#08x, must be %#08x",
+                        ubi_warn(ubi, "CRC error: calculated %#08x, must be %#08x",
                                  crc1, crc);
                         err = -EBADMSG;
                         goto out_unlock;
@@ -513,7 +513,8 @@ retry:
                 return new_pnum;
         }
 
-        ubi_msg("recover PEB %d, move data to PEB %d", pnum, new_pnum);
+        ubi_msg(ubi, "recover PEB %d, move data to PEB %d",
+                pnum, new_pnum);
 
         err = ubi_io_read_vid_hdr(ubi, pnum, vid_hdr, 1);
         if (err && err != UBI_IO_BITFLIPS) {
@@ -554,7 +555,7 @@ retry:
         up_read(&ubi->fm_sem);
         ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
 
-        ubi_msg("data was successfully recovered");
+        ubi_msg(ubi, "data was successfully recovered");
         return 0;
 
 out_unlock:
@@ -569,13 +570,13 @@ write_error:
          * Bad luck? This physical eraseblock is bad too? Crud. Let's try to
          * get another one.
          */
-        ubi_warn("failed to write to PEB %d", new_pnum);
+        ubi_warn(ubi, "failed to write to PEB %d", new_pnum);
         ubi_wl_put_peb(ubi, vol_id, lnum, new_pnum, 1);
         if (++tries > UBI_IO_RETRIES) {
                 ubi_free_vid_hdr(ubi, vid_hdr);
                 return err;
         }
-        ubi_msg("try again");
+        ubi_msg(ubi, "try again");
         goto retry;
 }
 
@@ -613,7 +614,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,
 
                 err = ubi_io_write_data(ubi, buf, pnum, offset, len);
                 if (err) {
-                        ubi_warn("failed to write data to PEB %d", pnum);
+                        ubi_warn(ubi, "failed to write data to PEB %d", pnum);
                         if (err == -EIO && ubi->bad_allowed)
                                 err = recover_peb(ubi, pnum, vol_id, lnum, buf,
                                                   offset, len);
@@ -654,7 +655,7 @@ retry:
 
         err = ubi_io_write_vid_hdr(ubi, pnum, vid_hdr);
         if (err) {
-                ubi_warn("failed to write VID header to LEB %d:%d, PEB %d",
+                ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
                          vol_id, lnum, pnum);
                 goto write_error;
         }
@@ -662,7 +663,7 @@ retry:
         if (len) {
                 err = ubi_io_write_data(ubi, buf, pnum, offset, len);
                 if (err) {
-                        ubi_warn("failed to write %d bytes at offset %d of LEB %d:%d, PEB %d",
+                        ubi_warn(ubi, "failed to write %d bytes at offset %d of LEB %d:%d, PEB %d",
                                  len, offset, vol_id, lnum, pnum);
                         goto write_error;
                 }
@@ -698,7 +699,7 @@ write_error:
         }
 
         vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
-        ubi_msg("try another PEB");
+        ubi_msg(ubi, "try another PEB");
         goto retry;
 }
 
@@ -775,14 +776,14 @@ retry:
 
         err = ubi_io_write_vid_hdr(ubi, pnum, vid_hdr);
         if (err) {
-                ubi_warn("failed to write VID header to LEB %d:%d, PEB %d",
+                ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
                          vol_id, lnum, pnum);
                 goto write_error;
         }
 
         err = ubi_io_write_data(ubi, buf, pnum, 0, len);
         if (err) {
-                ubi_warn("failed to write %d bytes of data to PEB %d",
+                ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
                          len, pnum);
                 goto write_error;
         }
@@ -818,7 +819,7 @@ write_error:
         }
 
         vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
-        ubi_msg("try another PEB");
+        ubi_msg(ubi, "try another PEB");
         goto retry;
 }
 
@@ -893,14 +894,14 @@ retry:
 
         err = ubi_io_write_vid_hdr(ubi, pnum, vid_hdr);
         if (err) {
-                ubi_warn("failed to write VID header to LEB %d:%d, PEB %d",
+                ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
                          vol_id, lnum, pnum);
                 goto write_error;
         }
 
         err = ubi_io_write_data(ubi, buf, pnum, 0, len);
         if (err) {
-                ubi_warn("failed to write %d bytes of data to PEB %d",
+                ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
                          len, pnum);
                 goto write_error;
         }
@@ -940,7 +941,7 @@ write_error:
         }
 
         vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
-        ubi_msg("try another PEB");
+        ubi_msg(ubi, "try another PEB");
         goto retry;
 }
 
@@ -1063,7 +1064,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
         dbg_wl("read %d bytes of data", aldata_size);
         err = ubi_io_read_data(ubi, ubi->peb_buf, from, 0, aldata_size);
         if (err && err != UBI_IO_BITFLIPS) {
-                ubi_warn("error %d while reading data from PEB %d",
+                ubi_warn(ubi, "error %d while reading data from PEB %d",
                          err, from);
                 err = MOVE_SOURCE_RD_ERR;
                 goto out_unlock_buf;
@@ -1113,7 +1114,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
         err = ubi_io_read_vid_hdr(ubi, to, vid_hdr, 1);
         if (err) {
                 if (err != UBI_IO_BITFLIPS) {
-                        ubi_warn("error %d while reading VID header back from PEB %d",
+                        ubi_warn(ubi, "error %d while reading VID header back from PEB %d",
                                  err, to);
                         if (is_error_sane(err))
                                 err = MOVE_TARGET_RD_ERR;
@@ -1140,7 +1141,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
                 err = ubi_io_read_data(ubi, ubi->peb_buf, to, 0, aldata_size);
                 if (err) {
                         if (err != UBI_IO_BITFLIPS) {
-                                ubi_warn("error %d while reading data back from PEB %d",
+                                ubi_warn(ubi, "error %d while reading data back from PEB %d",
                                          err, to);
                                 if (is_error_sane(err))
                                         err = MOVE_TARGET_RD_ERR;
@@ -1152,7 +1153,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
                 cond_resched();
 
                 if (crc != crc32(UBI_CRC32_INIT, ubi->peb_buf, data_size)) {
-                        ubi_warn("read data back from PEB %d and it is different",
+                        ubi_warn(ubi, "read data back from PEB %d and it is different",
                                  to);
                         err = -EINVAL;
                         goto out_unlock_buf;
@@ -1205,10 +1206,10 @@ static void print_rsvd_warning(struct ubi_device *ubi,
                         return;
         }
 
-        ubi_warn("cannot reserve enough PEBs for bad PEB handling, reserved %d, need %d",
+        ubi_warn(ubi, "cannot reserve enough PEBs for bad PEB handling, reserved %d, need %d",
                  ubi->beb_rsvd_pebs, ubi->beb_rsvd_level);
         if (ubi->corr_peb_count)
-                ubi_warn("%d PEBs are corrupted and not used",
+                ubi_warn(ubi, "%d PEBs are corrupted and not used",
                          ubi->corr_peb_count);
 }
 
@@ -1286,7 +1287,7 @@ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap,
                                         fm_eba[i][j] == UBI_LEB_UNMAPPED)
                                         continue;
 
-                                ubi_err("LEB:%i:%i is PEB:%i instead of %i!",
+                                ubi_err(ubi, "LEB:%i:%i is PEB:%i instead of %i!",
                                         vol->vol_id, i, fm_eba[i][j],
                                         scan_eba[i][j]);
                                 ubi_assert(0);
@@ -1366,10 +1367,10 @@ int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
         }
 
         if (ubi->avail_pebs < EBA_RESERVED_PEBS) {
-                ubi_err("no enough physical eraseblocks (%d, need %d)",
+                ubi_err(ubi, "no enough physical eraseblocks (%d, need %d)",
                         ubi->avail_pebs, EBA_RESERVED_PEBS);
                 if (ubi->corr_peb_count)
-                        ubi_err("%d PEBs are corrupted and not used",
+                        ubi_err(ubi, "%d PEBs are corrupted and not used",
                                 ubi->corr_peb_count);
                 err = -ENOSPC;
                 goto out_free;