UBI: drop redundant "UBI error" string

The ubi_err() macro automatically prefixes "UBI error" before the message.
By also using it here, we get a log like so:
	UBI error: ubi_init: UBI error: cannot initialize UBI, error -19

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index a56133585e924048a297041115336a58f3d6d709..745fbc574141a7dac6cde7b18460993b5051685c 100644 (file)
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1309,7 +1309,7 @@ out_version:
 out_class:
        class_destroy(ubi_class);
 out:
-       ubi_err("UBI error: cannot initialize UBI, error %d", err);
+       ubi_err("cannot initialize UBI, error %d", err);
        return err;
 }
 late_initcall(ubi_init);
@@ -1346,7 +1346,7 @@ static int __init bytes_str_to_int(const char *str)
 
        result = simple_strtoul(str, &endp, 0);
        if (str == endp || result >= INT_MAX) {
-               ubi_err("UBI error: incorrect bytes count: \"%s\"\n", str);
+               ubi_err("incorrect bytes count: \"%s\"\n", str);
                return -EINVAL;
        }
 
@@ -1362,7 +1362,7 @@ static int __init bytes_str_to_int(const char *str)
        case '\0':
                break;
        default:
-               ubi_err("UBI error: incorrect bytes count: \"%s\"\n", str);
+               ubi_err("incorrect bytes count: \"%s\"\n", str);
                return -EINVAL;
        }
 
@@ -1389,14 +1389,14 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
                return -EINVAL;
 
        if (mtd_devs == UBI_MAX_DEVICES) {
-               ubi_err("UBI error: too many parameters, max. is %d\n",
+               ubi_err("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) {
-               ubi_err("UBI error: parameter \"%s\" is too long, max. is %d\n",
+               ubi_err("parameter \"%s\" is too long, max. is %d\n",
                        val, MTD_PARAM_LEN_MAX);
                return -EINVAL;
        }
@@ -1416,7 +1416,7 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
                tokens[i] = strsep(&pbuf, ",");
 
        if (pbuf) {
-               ubi_err("UBI error: too many arguments at \"%s\"\n", val);
+               ubi_err("too many arguments at \"%s\"\n", val);
                return -EINVAL;
        }
 
@@ -1433,7 +1433,7 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
                int err = kstrtoint(tokens[2], 10, &p->max_beb_per1024);
 
                if (err) {
-                       ubi_err("UBI error: bad value for max_beb_per1024 parameter: %s",
+                       ubi_err("bad value for max_beb_per1024 parameter: %s",
                                tokens[2]);
                        return -EINVAL;
                }