mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
udf: Convert printks to pr_<level>
Use the current logging styles. Convert a few printks that should have been udf_warn and udf_err. Coalesce formats. Add #define pr_fmt. Move an #include "udfdecls.h" above other includes in udftime.c so pr_fmt works correctly. Strip prefixes from conversions as appropriate. Reorder logging definitions in udfdecl.h Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
a40ecd7b3c
commit
78ace70c41
7 changed files with 83 additions and 98 deletions
|
@ -114,7 +114,7 @@ int udf_CS0toUTF8(struct ustr *utf_o, const struct ustr *ocu_i)
|
|||
cmp_id = ocu_i->u_cmpID;
|
||||
if (cmp_id != 8 && cmp_id != 16) {
|
||||
memset(utf_o, 0, sizeof(struct ustr));
|
||||
printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n",
|
||||
pr_err("unknown compression code (%d) stri=%s\n",
|
||||
cmp_id, ocu_i->u_name);
|
||||
return 0;
|
||||
}
|
||||
|
@ -242,7 +242,7 @@ try_again:
|
|||
if (utf_cnt) {
|
||||
error_out:
|
||||
ocu[++u_len] = '?';
|
||||
printk(KERN_DEBUG "udf: bad UTF-8 character\n");
|
||||
printk(KERN_DEBUG pr_fmt("bad UTF-8 character\n"));
|
||||
}
|
||||
|
||||
ocu[length - 1] = (uint8_t)u_len + 1;
|
||||
|
@ -267,7 +267,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o,
|
|||
cmp_id = ocu_i->u_cmpID;
|
||||
if (cmp_id != 8 && cmp_id != 16) {
|
||||
memset(utf_o, 0, sizeof(struct ustr));
|
||||
printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n",
|
||||
pr_err("unknown compression code (%d) stri=%s\n",
|
||||
cmp_id, ocu_i->u_name);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue