Skip to content

Commit

Permalink
UBI: fix printk
Browse files Browse the repository at this point in the history
Add proper log level to printk's.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed Dec 26, 2007
1 parent 43f9b25 commit 458dbb3
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions drivers/mtd/ubi/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,8 +696,8 @@ static int __init ubi_init(void)
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);

if (mtd_devs > UBI_MAX_DEVICES) {
printk("UBI error: too many MTD devices, maximum is %d\n",
UBI_MAX_DEVICES);
printk(KERN_ERR "UBI error: too many MTD devices, "
"maximum is %d\n", UBI_MAX_DEVICES);
return -EINVAL;
}

Expand Down Expand Up @@ -776,7 +776,8 @@ static int __init bytes_str_to_int(const char *str)

result = simple_strtoul(str, &endp, 0);
if (str == endp || result < 0) {
printk("UBI error: incorrect bytes count: \"%s\"\n", str);
printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
str);
return -EINVAL;
}

Expand All @@ -794,7 +795,8 @@ static int __init bytes_str_to_int(const char *str)
case '\0':
break;
default:
printk("UBI error: incorrect bytes count: \"%s\"\n", str);
printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
str);
return -EINVAL;
}

Expand All @@ -821,20 +823,21 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
return -EINVAL;

if (mtd_devs == UBI_MAX_DEVICES) {
printk("UBI error: too many parameters, max. is %d\n",
printk(KERN_ERR "UBI error: too many parameters, max. is %d\n",
UBI_MAX_DEVICES);
return -EINVAL;
}

len = strnlen(val, MTD_PARAM_LEN_MAX);
if (len == MTD_PARAM_LEN_MAX) {
printk("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("UBI warning: empty 'mtd=' parameter - ignored\n");
printk(KERN_WARNING "UBI warning: empty 'mtd=' parameter - "
"ignored\n");
return 0;
}

Expand All @@ -848,7 +851,8 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
tokens[i] = strsep(&pbuf, ",");

if (pbuf) {
printk("UBI error: too many arguments at \"%s\"\n", val);
printk(KERN_ERR "UBI error: too many arguments at \"%s\"\n",
val);
return -EINVAL;
}

Expand Down

0 comments on commit 458dbb3

Please sign in to comment.