tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Artem Bityutskiy e28453bb 049333ce

+93 -103
+3 -3
drivers/mtd/ubi/attach.c
··· 1074 1074 if (ai->corr_peb_count) { 1075 1075 ubi_err("%d PEBs are corrupted and preserved", 1076 1076 ai->corr_peb_count); 1077 - printk(KERN_ERR "Corrupted PEBs are:"); 1077 + pr_err("Corrupted PEBs are:"); 1078 1078 list_for_each_entry(aeb, &ai->corr, u.list) 1079 - printk(KERN_CONT " %d", aeb->pnum); 1080 - printk(KERN_CONT "\n"); 1079 + pr_cont(" %d", aeb->pnum); 1080 + pr_cont("\n"); 1081 1081 1082 1082 /* 1083 1083 * If too many PEBs are corrupted, we refuse attaching,
+10 -13
drivers/mtd/ubi/build.c
··· 1304 1304 1305 1305 result = simple_strtoul(str, &endp, 0); 1306 1306 if (str == endp || result >= INT_MAX) { 1307 - printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", 1308 - str); 1307 + ubi_err("UBI error: incorrect bytes count: \"%s\"\n", str); 1309 1308 return -EINVAL; 1310 1309 } 1311 1310 ··· 1320 1321 case '\0': 1321 1322 break; 1322 1323 default: 1323 - printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", 1324 - str); 1324 + ubi_err("UBI error: incorrect bytes count: \"%s\"\n", str); 1325 1325 return -EINVAL; 1326 1326 } 1327 1327 ··· 1347 1349 return -EINVAL; 1348 1350 1349 1351 if (mtd_devs == UBI_MAX_DEVICES) { 1350 - printk(KERN_ERR "UBI error: too many parameters, max. is %d\n", 1351 - UBI_MAX_DEVICES); 1352 + ubi_err("UBI error: too many parameters, max. is %d\n", 1353 + UBI_MAX_DEVICES); 1352 1354 return -EINVAL; 1353 1355 } 1354 1356 1355 1357 len = strnlen(val, MTD_PARAM_LEN_MAX); 1356 1358 if (len == MTD_PARAM_LEN_MAX) { 1357 - printk(KERN_ERR "UBI error: parameter \"%s\" is too long, max. is %d\n", 1358 - val, MTD_PARAM_LEN_MAX); 1359 + ubi_err("UBI error: parameter \"%s\" is too long, max. is %d\n", 1360 + val, MTD_PARAM_LEN_MAX); 1359 1361 return -EINVAL; 1360 1362 } 1361 1363 1362 1364 if (len == 0) { 1363 - printk(KERN_WARNING "UBI warning: empty 'mtd=' parameter - ignored\n"); 1365 + pr_warn("UBI warning: empty 'mtd=' parameter - ignored\n"); 1364 1366 return 0; 1365 1367 } 1366 1368 ··· 1374 1376 tokens[i] = strsep(&pbuf, ","); 1375 1377 1376 1378 if (pbuf) { 1377 - printk(KERN_ERR "UBI error: too many arguments at \"%s\"\n", 1378 - val); 1379 + ubi_err("UBI error: too many arguments at \"%s\"\n", val); 1379 1380 return -EINVAL; 1380 1381 } 1381 1382 ··· 1391 1394 int err = kstrtoint(tokens[2], 10, &p->max_beb_per1024); 1392 1395 1393 1396 if (err) { 1394 - printk(KERN_ERR "UBI error: bad value for max_beb_per1024 parameter: %s", 1395 - tokens[2]); 1397 + ubi_err("UBI error: bad value for max_beb_per1024 parameter: %s", 1398 + tokens[2]); 1396 1399 return -EINVAL; 1397 1400 } 1398 1401 }
+71 -78
drivers/mtd/ubi/debug.c
··· 62 62 */ 63 63 void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr) 64 64 { 65 - printk(KERN_DEBUG "Erase counter header dump:\n"); 66 - printk(KERN_DEBUG "\tmagic %#08x\n", 67 - be32_to_cpu(ec_hdr->magic)); 68 - printk(KERN_DEBUG "\tversion %d\n", (int)ec_hdr->version); 69 - printk(KERN_DEBUG "\tec %llu\n", 70 - (long long)be64_to_cpu(ec_hdr->ec)); 71 - printk(KERN_DEBUG "\tvid_hdr_offset %d\n", 72 - be32_to_cpu(ec_hdr->vid_hdr_offset)); 73 - printk(KERN_DEBUG "\tdata_offset %d\n", 74 - be32_to_cpu(ec_hdr->data_offset)); 75 - printk(KERN_DEBUG "\timage_seq %d\n", 76 - be32_to_cpu(ec_hdr->image_seq)); 77 - printk(KERN_DEBUG "\thdr_crc %#08x\n", 78 - be32_to_cpu(ec_hdr->hdr_crc)); 79 - printk(KERN_DEBUG "erase counter header hexdump:\n"); 65 + pr_err("Erase counter header dump:\n"); 66 + pr_err("\tmagic %#08x\n", be32_to_cpu(ec_hdr->magic)); 67 + pr_err("\tversion %d\n", (int)ec_hdr->version); 68 + pr_err("\tec %llu\n", (long long)be64_to_cpu(ec_hdr->ec)); 69 + pr_err("\tvid_hdr_offset %d\n", be32_to_cpu(ec_hdr->vid_hdr_offset)); 70 + pr_err("\tdata_offset %d\n", be32_to_cpu(ec_hdr->data_offset)); 71 + pr_err("\timage_seq %d\n", be32_to_cpu(ec_hdr->image_seq)); 72 + pr_err("\thdr_crc %#08x\n", be32_to_cpu(ec_hdr->hdr_crc)); 73 + pr_err("erase counter header hexdump:\n"); 80 74 print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, 81 75 ec_hdr, UBI_EC_HDR_SIZE, 1); 82 76 } ··· 81 87 */ 82 88 void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr) 83 89 { 84 - printk(KERN_DEBUG "Volume identifier header dump:\n"); 85 - printk(KERN_DEBUG "\tmagic %08x\n", be32_to_cpu(vid_hdr->magic)); 86 - printk(KERN_DEBUG "\tversion %d\n", (int)vid_hdr->version); 87 - printk(KERN_DEBUG "\tvol_type %d\n", (int)vid_hdr->vol_type); 88 - printk(KERN_DEBUG "\tcopy_flag %d\n", (int)vid_hdr->copy_flag); 89 - printk(KERN_DEBUG "\tcompat %d\n", (int)vid_hdr->compat); 90 - printk(KERN_DEBUG "\tvol_id %d\n", be32_to_cpu(vid_hdr->vol_id)); 91 - printk(KERN_DEBUG "\tlnum %d\n", be32_to_cpu(vid_hdr->lnum)); 92 - printk(KERN_DEBUG "\tdata_size %d\n", be32_to_cpu(vid_hdr->data_size)); 93 - printk(KERN_DEBUG "\tused_ebs %d\n", be32_to_cpu(vid_hdr->used_ebs)); 94 - printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(vid_hdr->data_pad)); 95 - printk(KERN_DEBUG "\tsqnum %llu\n", 90 + pr_err("Volume identifier header dump:\n"); 91 + pr_err("\tmagic %08x\n", be32_to_cpu(vid_hdr->magic)); 92 + pr_err("\tversion %d\n", (int)vid_hdr->version); 93 + pr_err("\tvol_type %d\n", (int)vid_hdr->vol_type); 94 + pr_err("\tcopy_flag %d\n", (int)vid_hdr->copy_flag); 95 + pr_err("\tcompat %d\n", (int)vid_hdr->compat); 96 + pr_err("\tvol_id %d\n", be32_to_cpu(vid_hdr->vol_id)); 97 + pr_err("\tlnum %d\n", be32_to_cpu(vid_hdr->lnum)); 98 + pr_err("\tdata_size %d\n", be32_to_cpu(vid_hdr->data_size)); 99 + pr_err("\tused_ebs %d\n", be32_to_cpu(vid_hdr->used_ebs)); 100 + pr_err("\tdata_pad %d\n", be32_to_cpu(vid_hdr->data_pad)); 101 + pr_err("\tsqnum %llu\n", 96 102 (unsigned long long)be64_to_cpu(vid_hdr->sqnum)); 97 - printk(KERN_DEBUG "\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc)); 98 - printk(KERN_DEBUG "Volume identifier header hexdump:\n"); 103 + pr_err("\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc)); 104 + pr_err("Volume identifier header hexdump:\n"); 99 105 print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, 100 106 vid_hdr, UBI_VID_HDR_SIZE, 1); 101 107 } ··· 106 112 */ 107 113 void ubi_dump_vol_info(const struct ubi_volume *vol) 108 114 { 109 - printk(KERN_DEBUG "Volume information dump:\n"); 110 - printk(KERN_DEBUG "\tvol_id %d\n", vol->vol_id); 111 - printk(KERN_DEBUG "\treserved_pebs %d\n", vol->reserved_pebs); 112 - printk(KERN_DEBUG "\talignment %d\n", vol->alignment); 113 - printk(KERN_DEBUG "\tdata_pad %d\n", vol->data_pad); 114 - printk(KERN_DEBUG "\tvol_type %d\n", vol->vol_type); 115 - printk(KERN_DEBUG "\tname_len %d\n", vol->name_len); 116 - printk(KERN_DEBUG "\tusable_leb_size %d\n", vol->usable_leb_size); 117 - printk(KERN_DEBUG "\tused_ebs %d\n", vol->used_ebs); 118 - printk(KERN_DEBUG "\tused_bytes %lld\n", vol->used_bytes); 119 - printk(KERN_DEBUG "\tlast_eb_bytes %d\n", vol->last_eb_bytes); 120 - printk(KERN_DEBUG "\tcorrupted %d\n", vol->corrupted); 121 - printk(KERN_DEBUG "\tupd_marker %d\n", vol->upd_marker); 115 + pr_err("Volume information dump:\n"); 116 + pr_err("\tvol_id %d\n", vol->vol_id); 117 + pr_err("\treserved_pebs %d\n", vol->reserved_pebs); 118 + pr_err("\talignment %d\n", vol->alignment); 119 + pr_err("\tdata_pad %d\n", vol->data_pad); 120 + pr_err("\tvol_type %d\n", vol->vol_type); 121 + pr_err("\tname_len %d\n", vol->name_len); 122 + pr_err("\tusable_leb_size %d\n", vol->usable_leb_size); 123 + pr_err("\tused_ebs %d\n", vol->used_ebs); 124 + pr_err("\tused_bytes %lld\n", vol->used_bytes); 125 + pr_err("\tlast_eb_bytes %d\n", vol->last_eb_bytes); 126 + pr_err("\tcorrupted %d\n", vol->corrupted); 127 + pr_err("\tupd_marker %d\n", vol->upd_marker); 122 128 123 129 if (vol->name_len <= UBI_VOL_NAME_MAX && 124 130 strnlen(vol->name, vol->name_len + 1) == vol->name_len) { 125 - printk(KERN_DEBUG "\tname %s\n", vol->name); 131 + pr_err("\tname %s\n", vol->name); 126 132 } else { 127 - printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n", 133 + pr_err("\t1st 5 characters of name: %c%c%c%c%c\n", 128 134 vol->name[0], vol->name[1], vol->name[2], 129 135 vol->name[3], vol->name[4]); 130 136 } ··· 139 145 { 140 146 int name_len = be16_to_cpu(r->name_len); 141 147 142 - printk(KERN_DEBUG "Volume table record %d dump:\n", idx); 143 - printk(KERN_DEBUG "\treserved_pebs %d\n", 144 - be32_to_cpu(r->reserved_pebs)); 145 - printk(KERN_DEBUG "\talignment %d\n", be32_to_cpu(r->alignment)); 146 - printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(r->data_pad)); 147 - printk(KERN_DEBUG "\tvol_type %d\n", (int)r->vol_type); 148 - printk(KERN_DEBUG "\tupd_marker %d\n", (int)r->upd_marker); 149 - printk(KERN_DEBUG "\tname_len %d\n", name_len); 148 + pr_err("Volume table record %d dump:\n", idx); 149 + pr_err("\treserved_pebs %d\n", be32_to_cpu(r->reserved_pebs)); 150 + pr_err("\talignment %d\n", be32_to_cpu(r->alignment)); 151 + pr_err("\tdata_pad %d\n", be32_to_cpu(r->data_pad)); 152 + pr_err("\tvol_type %d\n", (int)r->vol_type); 153 + pr_err("\tupd_marker %d\n", (int)r->upd_marker); 154 + pr_err("\tname_len %d\n", name_len); 150 155 151 156 if (r->name[0] == '\0') { 152 - printk(KERN_DEBUG "\tname NULL\n"); 157 + pr_err("\tname NULL\n"); 153 158 return; 154 159 } 155 160 156 161 if (name_len <= UBI_VOL_NAME_MAX && 157 162 strnlen(&r->name[0], name_len + 1) == name_len) { 158 - printk(KERN_DEBUG "\tname %s\n", &r->name[0]); 163 + pr_err("\tname %s\n", &r->name[0]); 159 164 } else { 160 - printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n", 165 + pr_err("\t1st 5 characters of name: %c%c%c%c%c\n", 161 166 r->name[0], r->name[1], r->name[2], r->name[3], 162 167 r->name[4]); 163 168 } 164 - printk(KERN_DEBUG "\tcrc %#08x\n", be32_to_cpu(r->crc)); 169 + pr_err("\tcrc %#08x\n", be32_to_cpu(r->crc)); 165 170 } 166 171 167 172 /** ··· 169 176 */ 170 177 void ubi_dump_av(const struct ubi_ainf_volume *av) 171 178 { 172 - printk(KERN_DEBUG "Volume attaching information dump:\n"); 173 - printk(KERN_DEBUG "\tvol_id %d\n", av->vol_id); 174 - printk(KERN_DEBUG "\thighest_lnum %d\n", av->highest_lnum); 175 - printk(KERN_DEBUG "\tleb_count %d\n", av->leb_count); 176 - printk(KERN_DEBUG "\tcompat %d\n", av->compat); 177 - printk(KERN_DEBUG "\tvol_type %d\n", av->vol_type); 178 - printk(KERN_DEBUG "\tused_ebs %d\n", av->used_ebs); 179 - printk(KERN_DEBUG "\tlast_data_size %d\n", av->last_data_size); 180 - printk(KERN_DEBUG "\tdata_pad %d\n", av->data_pad); 179 + pr_err("Volume attaching information dump:\n"); 180 + pr_err("\tvol_id %d\n", av->vol_id); 181 + pr_err("\thighest_lnum %d\n", av->highest_lnum); 182 + pr_err("\tleb_count %d\n", av->leb_count); 183 + pr_err("\tcompat %d\n", av->compat); 184 + pr_err("\tvol_type %d\n", av->vol_type); 185 + pr_err("\tused_ebs %d\n", av->used_ebs); 186 + pr_err("\tlast_data_size %d\n", av->last_data_size); 187 + pr_err("\tdata_pad %d\n", av->data_pad); 181 188 } 182 189 183 190 /** ··· 187 194 */ 188 195 void ubi_dump_aeb(const struct ubi_ainf_peb *aeb, int type) 189 196 { 190 - printk(KERN_DEBUG "eraseblock attaching information dump:\n"); 191 - printk(KERN_DEBUG "\tec %d\n", aeb->ec); 192 - printk(KERN_DEBUG "\tpnum %d\n", aeb->pnum); 197 + pr_err("eraseblock attaching information dump:\n"); 198 + pr_err("\tec %d\n", aeb->ec); 199 + pr_err("\tpnum %d\n", aeb->pnum); 193 200 if (type == 0) { 194 - printk(KERN_DEBUG "\tlnum %d\n", aeb->lnum); 195 - printk(KERN_DEBUG "\tscrub %d\n", aeb->scrub); 196 - printk(KERN_DEBUG "\tsqnum %llu\n", aeb->sqnum); 201 + pr_err("\tlnum %d\n", aeb->lnum); 202 + pr_err("\tscrub %d\n", aeb->scrub); 203 + pr_err("\tsqnum %llu\n", aeb->sqnum); 197 204 } 198 205 } 199 206 ··· 205 212 { 206 213 char nm[17]; 207 214 208 - printk(KERN_DEBUG "Volume creation request dump:\n"); 209 - printk(KERN_DEBUG "\tvol_id %d\n", req->vol_id); 210 - printk(KERN_DEBUG "\talignment %d\n", req->alignment); 211 - printk(KERN_DEBUG "\tbytes %lld\n", (long long)req->bytes); 212 - printk(KERN_DEBUG "\tvol_type %d\n", req->vol_type); 213 - printk(KERN_DEBUG "\tname_len %d\n", req->name_len); 215 + pr_err("Volume creation request dump:\n"); 216 + pr_err("\tvol_id %d\n", req->vol_id); 217 + pr_err("\talignment %d\n", req->alignment); 218 + pr_err("\tbytes %lld\n", (long long)req->bytes); 219 + pr_err("\tvol_type %d\n", req->vol_type); 220 + pr_err("\tname_len %d\n", req->name_len); 214 221 215 222 memcpy(nm, req->name, 16); 216 223 nm[16] = 0; 217 - printk(KERN_DEBUG "\t1st 16 characters of name: %s\n", nm); 224 + pr_err("\t1st 16 characters of name: %s\n", nm); 218 225 } 219 226 220 227 /**
+4 -4
drivers/mtd/ubi/debug.h
··· 29 29 30 30 #define ubi_assert(expr) do { \ 31 31 if (unlikely(!(expr))) { \ 32 - printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \ 32 + pr_crit("UBI assert failed in %s at %u (pid %d)\n", \ 33 33 __func__, __LINE__, current->pid); \ 34 34 dump_stack(); \ 35 35 } \ 36 36 } while (0) 37 37 38 - #define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a) \ 38 + #define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a) \ 39 39 print_hex_dump(l, ps, pt, r, g, b, len, a) 40 40 41 41 #define ubi_dbg_msg(type, fmt, ...) \ ··· 43 43 ##__VA_ARGS__) 44 44 45 45 /* Just a debugging messages not related to any specific UBI subsystem */ 46 - #define dbg_msg(fmt, ...) \ 47 - printk(KERN_DEBUG "UBI DBG (pid %d): %s: " fmt "\n", \ 46 + #define dbg_msg(fmt, ...) \ 47 + pr_err("UBI DBG (pid %d): %s: " fmt "\n", \ 48 48 current->pid, __func__, ##__VA_ARGS__) 49 49 50 50 /* General debugging messages */
+1 -1
drivers/mtd/ubi/gluebi.c
··· 41 41 #include "ubi-media.h" 42 42 43 43 #define err_msg(fmt, ...) \ 44 - printk(KERN_DEBUG "gluebi (pid %d): %s: " fmt "\n", \ 44 + pr_err("gluebi (pid %d): %s: " fmt "\n", \ 45 45 current->pid, __func__, ##__VA_ARGS__) 46 46 47 47 /**
+4 -4
drivers/mtd/ubi/ubi.h
··· 51 51 #define UBI_NAME_STR "ubi" 52 52 53 53 /* Normal UBI messages */ 54 - #define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__) 54 + #define ubi_msg(fmt, ...) pr_notice("UBI: " fmt "\n", ##__VA_ARGS__) 55 55 /* UBI warning messages */ 56 - #define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \ 57 - __func__, ##__VA_ARGS__) 56 + #define ubi_warn(fmt, ...) pr_warn("UBI warning: %s: " fmt "\n", \ 57 + __func__, ##__VA_ARGS__) 58 58 /* UBI error messages */ 59 - #define ubi_err(fmt, ...) printk(KERN_ERR "UBI error: %s: " fmt "\n", \ 59 + #define ubi_err(fmt, ...) pr_err("UBI error: %s: " fmt "\n", \ 60 60 __func__, ##__VA_ARGS__) 61 61 62 62 /* Background thread name pattern */