Skip to content

Commit

Permalink
UBI: fix error printing
Browse files Browse the repository at this point in the history
Use existing ubi_err() as the rest of the code does.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed Apr 17, 2008
1 parent 92a74f1 commit c450609
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions drivers/mtd/ubi/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,34 +950,33 @@ static int __init ubi_init(void)
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);

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

/* Create base sysfs directory and sysfs files */
ubi_class = class_create(THIS_MODULE, UBI_NAME_STR);
if (IS_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;
}

err = class_create_file(ubi_class, &ubi_version);
if (err) {
printk(KERN_ERR "UBI error: cannot create sysfs file\n");
ubi_err("cannot create sysfs file");
goto out_class;
}

err = misc_register(&ubi_ctrl_cdev);
if (err) {
printk(KERN_ERR "UBI error: cannot register device\n");
ubi_err("cannot register device");
goto out_version;
}

ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab",
sizeof(struct ubi_wl_entry),
0, 0, NULL);
sizeof(struct ubi_wl_entry),
0, 0, NULL);
if (!ubi_wl_entry_slab)
goto out_dev_unreg;

Expand All @@ -1000,8 +999,7 @@ static int __init ubi_init(void)
mutex_unlock(&ubi_devices_mutex);
if (err < 0) {
put_mtd_device(mtd);
printk(KERN_ERR "UBI error: cannot attach mtd%d\n",
mtd->index);
ubi_err("cannot attach mtd%d", mtd->index);
goto out_detach;
}
}
Expand All @@ -1023,7 +1021,7 @@ static int __init ubi_init(void)
out_class:
class_destroy(ubi_class);
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;
}
module_init(ubi_init);
Expand Down

0 comments on commit c450609

Please sign in to comment.