Commit c4506092 authored by Artem Bityutskiy's avatar Artem Bityutskiy

UBI: fix error printing

Use existing ubi_err() as the rest of the code does.
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 92a74f1c
...@@ -950,8 +950,7 @@ static int __init ubi_init(void) ...@@ -950,8 +950,7 @@ static int __init ubi_init(void)
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64); BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);
if (mtd_devs > UBI_MAX_DEVICES) { if (mtd_devs > UBI_MAX_DEVICES) {
printk(KERN_ERR "UBI error: too many MTD devices, " ubi_err("too many MTD devices, maximum is %d", UBI_MAX_DEVICES);
"maximum is %d\n", UBI_MAX_DEVICES);
return -EINVAL; return -EINVAL;
} }
...@@ -959,25 +958,25 @@ static int __init ubi_init(void) ...@@ -959,25 +958,25 @@ static int __init ubi_init(void)
ubi_class = class_create(THIS_MODULE, UBI_NAME_STR); ubi_class = class_create(THIS_MODULE, UBI_NAME_STR);
if (IS_ERR(ubi_class)) { if (IS_ERR(ubi_class)) {
err = PTR_ERR(ubi_class); err = PTR_ERR(ubi_class);
printk(KERN_ERR "UBI error: cannot create UBI class\n"); ubi_err("cannot create UBI class");
goto out; goto out;
} }
err = class_create_file(ubi_class, &ubi_version); err = class_create_file(ubi_class, &ubi_version);
if (err) { if (err) {
printk(KERN_ERR "UBI error: cannot create sysfs file\n"); ubi_err("cannot create sysfs file");
goto out_class; goto out_class;
} }
err = misc_register(&ubi_ctrl_cdev); err = misc_register(&ubi_ctrl_cdev);
if (err) { if (err) {
printk(KERN_ERR "UBI error: cannot register device\n"); ubi_err("cannot register device");
goto out_version; goto out_version;
} }
ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab", ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab",
sizeof(struct ubi_wl_entry), sizeof(struct ubi_wl_entry),
0, 0, NULL); 0, 0, NULL);
if (!ubi_wl_entry_slab) if (!ubi_wl_entry_slab)
goto out_dev_unreg; goto out_dev_unreg;
...@@ -1000,8 +999,7 @@ static int __init ubi_init(void) ...@@ -1000,8 +999,7 @@ static int __init ubi_init(void)
mutex_unlock(&ubi_devices_mutex); mutex_unlock(&ubi_devices_mutex);
if (err < 0) { if (err < 0) {
put_mtd_device(mtd); put_mtd_device(mtd);
printk(KERN_ERR "UBI error: cannot attach mtd%d\n", ubi_err("cannot attach mtd%d", mtd->index);
mtd->index);
goto out_detach; goto out_detach;
} }
} }
...@@ -1023,7 +1021,7 @@ out_version: ...@@ -1023,7 +1021,7 @@ out_version:
out_class: out_class:
class_destroy(ubi_class); class_destroy(ubi_class);
out: out:
printk(KERN_ERR "UBI error: cannot initialize UBI, error %d\n", err); ubi_err("UBI error: cannot initialize UBI, error %d", err);
return err; return err;
} }
module_init(ubi_init); module_init(ubi_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment