UBI: use pr_ helper instead of printk

Use 'pr_err()' instead of 'printk(KERN_ERR', etc.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

1 files changed, 71 insertions, 78 deletions

diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index dd97324f3a13..26908a59506b 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -62,21 +62,15 @@ out:
  */
 void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
 {
-        printk(KERN_DEBUG "Erase counter header dump:\n");
-        printk(KERN_DEBUG "\tmagic          %#08x\n",
-               be32_to_cpu(ec_hdr->magic));
-        printk(KERN_DEBUG "\tversion        %d\n", (int)ec_hdr->version);
-        printk(KERN_DEBUG "\tec             %llu\n",
-               (long long)be64_to_cpu(ec_hdr->ec));
-        printk(KERN_DEBUG "\tvid_hdr_offset %d\n",
-               be32_to_cpu(ec_hdr->vid_hdr_offset));
-        printk(KERN_DEBUG "\tdata_offset    %d\n",
-               be32_to_cpu(ec_hdr->data_offset));
-        printk(KERN_DEBUG "\timage_seq      %d\n",
-               be32_to_cpu(ec_hdr->image_seq));
-        printk(KERN_DEBUG "\thdr_crc        %#08x\n",
-               be32_to_cpu(ec_hdr->hdr_crc));
-        printk(KERN_DEBUG "erase counter header hexdump:\n");
+        pr_err("Erase counter header dump:\n");
+        pr_err("\tmagic          %#08x\n", be32_to_cpu(ec_hdr->magic));
+        pr_err("\tversion        %d\n", (int)ec_hdr->version);
+        pr_err("\tec             %llu\n", (long long)be64_to_cpu(ec_hdr->ec));
+        pr_err("\tvid_hdr_offset %d\n", be32_to_cpu(ec_hdr->vid_hdr_offset));
+        pr_err("\tdata_offset    %d\n", be32_to_cpu(ec_hdr->data_offset));
+        pr_err("\timage_seq      %d\n", be32_to_cpu(ec_hdr->image_seq));
+        pr_err("\thdr_crc        %#08x\n", be32_to_cpu(ec_hdr->hdr_crc));
+        pr_err("erase counter header hexdump:\n");
         print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
                        ec_hdr, UBI_EC_HDR_SIZE, 1);
 }
@@ -87,21 +81,21 @@ void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
  */
 void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
 {
-        printk(KERN_DEBUG "Volume identifier header dump:\n");
-        printk(KERN_DEBUG "\tmagic     %08x\n", be32_to_cpu(vid_hdr->magic));
-        printk(KERN_DEBUG "\tversion   %d\n",  (int)vid_hdr->version);
-        printk(KERN_DEBUG "\tvol_type  %d\n",  (int)vid_hdr->vol_type);
-        printk(KERN_DEBUG "\tcopy_flag %d\n",  (int)vid_hdr->copy_flag);
-        printk(KERN_DEBUG "\tcompat    %d\n",  (int)vid_hdr->compat);
-        printk(KERN_DEBUG "\tvol_id    %d\n",  be32_to_cpu(vid_hdr->vol_id));
-        printk(KERN_DEBUG "\tlnum      %d\n",  be32_to_cpu(vid_hdr->lnum));
-        printk(KERN_DEBUG "\tdata_size %d\n",  be32_to_cpu(vid_hdr->data_size));
-        printk(KERN_DEBUG "\tused_ebs  %d\n",  be32_to_cpu(vid_hdr->used_ebs));
-        printk(KERN_DEBUG "\tdata_pad  %d\n",  be32_to_cpu(vid_hdr->data_pad));
-        printk(KERN_DEBUG "\tsqnum     %llu\n",
+        pr_err("Volume identifier header dump:\n");
+        pr_err("\tmagic     %08x\n", be32_to_cpu(vid_hdr->magic));
+        pr_err("\tversion   %d\n",  (int)vid_hdr->version);
+        pr_err("\tvol_type  %d\n",  (int)vid_hdr->vol_type);
+        pr_err("\tcopy_flag %d\n",  (int)vid_hdr->copy_flag);
+        pr_err("\tcompat    %d\n",  (int)vid_hdr->compat);
+        pr_err("\tvol_id    %d\n",  be32_to_cpu(vid_hdr->vol_id));
+        pr_err("\tlnum      %d\n",  be32_to_cpu(vid_hdr->lnum));
+        pr_err("\tdata_size %d\n",  be32_to_cpu(vid_hdr->data_size));
+        pr_err("\tused_ebs  %d\n",  be32_to_cpu(vid_hdr->used_ebs));
+        pr_err("\tdata_pad  %d\n",  be32_to_cpu(vid_hdr->data_pad));
+        pr_err("\tsqnum     %llu\n",
                 (unsigned long long)be64_to_cpu(vid_hdr->sqnum));
-        printk(KERN_DEBUG "\thdr_crc   %08x\n", be32_to_cpu(vid_hdr->hdr_crc));
-        printk(KERN_DEBUG "Volume identifier header hexdump:\n");
+        pr_err("\thdr_crc   %08x\n", be32_to_cpu(vid_hdr->hdr_crc));
+        pr_err("Volume identifier header hexdump:\n");
         print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
                        vid_hdr, UBI_VID_HDR_SIZE, 1);
 }
@@ -112,25 +106,25 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
  */
 void ubi_dump_vol_info(const struct ubi_volume *vol)
 {
-        printk(KERN_DEBUG "Volume information dump:\n");
-        printk(KERN_DEBUG "\tvol_id          %d\n", vol->vol_id);
-        printk(KERN_DEBUG "\treserved_pebs   %d\n", vol->reserved_pebs);
-        printk(KERN_DEBUG "\talignment       %d\n", vol->alignment);
-        printk(KERN_DEBUG "\tdata_pad        %d\n", vol->data_pad);
-        printk(KERN_DEBUG "\tvol_type        %d\n", vol->vol_type);
-        printk(KERN_DEBUG "\tname_len        %d\n", vol->name_len);
-        printk(KERN_DEBUG "\tusable_leb_size %d\n", vol->usable_leb_size);
-        printk(KERN_DEBUG "\tused_ebs        %d\n", vol->used_ebs);
-        printk(KERN_DEBUG "\tused_bytes      %lld\n", vol->used_bytes);
-        printk(KERN_DEBUG "\tlast_eb_bytes   %d\n", vol->last_eb_bytes);
-        printk(KERN_DEBUG "\tcorrupted       %d\n", vol->corrupted);
-        printk(KERN_DEBUG "\tupd_marker      %d\n", vol->upd_marker);
+        pr_err("Volume information dump:\n");
+        pr_err("\tvol_id          %d\n", vol->vol_id);
+        pr_err("\treserved_pebs   %d\n", vol->reserved_pebs);
+        pr_err("\talignment       %d\n", vol->alignment);
+        pr_err("\tdata_pad        %d\n", vol->data_pad);
+        pr_err("\tvol_type        %d\n", vol->vol_type);
+        pr_err("\tname_len        %d\n", vol->name_len);
+        pr_err("\tusable_leb_size %d\n", vol->usable_leb_size);
+        pr_err("\tused_ebs        %d\n", vol->used_ebs);
+        pr_err("\tused_bytes      %lld\n", vol->used_bytes);
+        pr_err("\tlast_eb_bytes   %d\n", vol->last_eb_bytes);
+        pr_err("\tcorrupted       %d\n", vol->corrupted);
+        pr_err("\tupd_marker      %d\n", vol->upd_marker);
 
         if (vol->name_len <= UBI_VOL_NAME_MAX &&
             strnlen(vol->name, vol->name_len + 1) == vol->name_len) {
-                printk(KERN_DEBUG "\tname            %s\n", vol->name);
+                pr_err("\tname            %s\n", vol->name);
         } else {
-                printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
+                pr_err("\t1st 5 characters of name: %c%c%c%c%c\n",
                        vol->name[0], vol->name[1], vol->name[2],
                        vol->name[3], vol->name[4]);
         }
@@ -145,29 +139,28 @@ void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
 {
         int name_len = be16_to_cpu(r->name_len);
 
-        printk(KERN_DEBUG "Volume table record %d dump:\n", idx);
-        printk(KERN_DEBUG "\treserved_pebs   %d\n",
-               be32_to_cpu(r->reserved_pebs));
-        printk(KERN_DEBUG "\talignment       %d\n", be32_to_cpu(r->alignment));
-        printk(KERN_DEBUG "\tdata_pad        %d\n", be32_to_cpu(r->data_pad));
-        printk(KERN_DEBUG "\tvol_type        %d\n", (int)r->vol_type);
-        printk(KERN_DEBUG "\tupd_marker      %d\n", (int)r->upd_marker);
-        printk(KERN_DEBUG "\tname_len        %d\n", name_len);
+        pr_err("Volume table record %d dump:\n", idx);
+        pr_err("\treserved_pebs   %d\n", be32_to_cpu(r->reserved_pebs));
+        pr_err("\talignment       %d\n", be32_to_cpu(r->alignment));
+        pr_err("\tdata_pad        %d\n", be32_to_cpu(r->data_pad));
+        pr_err("\tvol_type        %d\n", (int)r->vol_type);
+        pr_err("\tupd_marker      %d\n", (int)r->upd_marker);
+        pr_err("\tname_len        %d\n", name_len);
 
         if (r->name[0] == '\0') {
-                printk(KERN_DEBUG "\tname            NULL\n");
+                pr_err("\tname            NULL\n");
                 return;
         }
 
         if (name_len <= UBI_VOL_NAME_MAX &&
             strnlen(&r->name[0], name_len + 1) == name_len) {
-                printk(KERN_DEBUG "\tname            %s\n", &r->name[0]);
+                pr_err("\tname            %s\n", &r->name[0]);
         } else {
-                printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
+                pr_err("\t1st 5 characters of name: %c%c%c%c%c\n",
                         r->name[0], r->name[1], r->name[2], r->name[3],
                         r->name[4]);
         }
-        printk(KERN_DEBUG "\tcrc             %#08x\n", be32_to_cpu(r->crc));
+        pr_err("\tcrc             %#08x\n", be32_to_cpu(r->crc));
 }
 
 /**
@@ -176,15 +169,15 @@ void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
  */
 void ubi_dump_av(const struct ubi_ainf_volume *av)
 {
-        printk(KERN_DEBUG "Volume attaching information dump:\n");
-        printk(KERN_DEBUG "\tvol_id         %d\n", av->vol_id);
-        printk(KERN_DEBUG "\thighest_lnum   %d\n", av->highest_lnum);
-        printk(KERN_DEBUG "\tleb_count      %d\n", av->leb_count);
-        printk(KERN_DEBUG "\tcompat         %d\n", av->compat);
-        printk(KERN_DEBUG "\tvol_type       %d\n", av->vol_type);
-        printk(KERN_DEBUG "\tused_ebs       %d\n", av->used_ebs);
-        printk(KERN_DEBUG "\tlast_data_size %d\n", av->last_data_size);
-        printk(KERN_DEBUG "\tdata_pad       %d\n", av->data_pad);
+        pr_err("Volume attaching information dump:\n");
+        pr_err("\tvol_id         %d\n", av->vol_id);
+        pr_err("\thighest_lnum   %d\n", av->highest_lnum);
+        pr_err("\tleb_count      %d\n", av->leb_count);
+        pr_err("\tcompat         %d\n", av->compat);
+        pr_err("\tvol_type       %d\n", av->vol_type);
+        pr_err("\tused_ebs       %d\n", av->used_ebs);
+        pr_err("\tlast_data_size %d\n", av->last_data_size);
+        pr_err("\tdata_pad       %d\n", av->data_pad);
 }
 
 /**
@@ -194,13 +187,13 @@ void ubi_dump_av(const struct ubi_ainf_volume *av)
  */
 void ubi_dump_aeb(const struct ubi_ainf_peb *aeb, int type)
 {
-        printk(KERN_DEBUG "eraseblock attaching information dump:\n");
-        printk(KERN_DEBUG "\tec       %d\n", aeb->ec);
-        printk(KERN_DEBUG "\tpnum     %d\n", aeb->pnum);
+        pr_err("eraseblock attaching information dump:\n");
+        pr_err("\tec       %d\n", aeb->ec);
+        pr_err("\tpnum     %d\n", aeb->pnum);
         if (type == 0) {
-                printk(KERN_DEBUG "\tlnum     %d\n", aeb->lnum);
-                printk(KERN_DEBUG "\tscrub    %d\n", aeb->scrub);
-                printk(KERN_DEBUG "\tsqnum    %llu\n", aeb->sqnum);
+                pr_err("\tlnum     %d\n", aeb->lnum);
+                pr_err("\tscrub    %d\n", aeb->scrub);
+                pr_err("\tsqnum    %llu\n", aeb->sqnum);
         }
 }
 
@@ -212,16 +205,16 @@ void ubi_dump_mkvol_req(const struct ubi_mkvol_req *req)
 {
         char nm[17];
 
-        printk(KERN_DEBUG "Volume creation request dump:\n");
-        printk(KERN_DEBUG "\tvol_id    %d\n",   req->vol_id);
-        printk(KERN_DEBUG "\talignment %d\n",   req->alignment);
-        printk(KERN_DEBUG "\tbytes     %lld\n", (long long)req->bytes);
-        printk(KERN_DEBUG "\tvol_type  %d\n",   req->vol_type);
-        printk(KERN_DEBUG "\tname_len  %d\n",   req->name_len);
+        pr_err("Volume creation request dump:\n");
+        pr_err("\tvol_id    %d\n",   req->vol_id);
+        pr_err("\talignment %d\n",   req->alignment);
+        pr_err("\tbytes     %lld\n", (long long)req->bytes);
+        pr_err("\tvol_type  %d\n",   req->vol_type);
+        pr_err("\tname_len  %d\n",   req->name_len);
 
         memcpy(nm, req->name, 16);
         nm[16] = 0;
-        printk(KERN_DEBUG "\t1st 16 characters of name: %s\n", nm);
+        pr_err("\t1st 16 characters of name: %s\n", nm);
 }
 
 /**