qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: mtd: ubi: Add missing newlines in ubi_init() 

I just stumbled over some cluttered UBI messages. It seems some newline
chars are missing in the current U-Boot UBI source. Lets fix this
in U-Boot as well (Linux has those fixes already).

Change-Id: I21c13a3ef73aa78d4cf32721b1dd21cab186e8bd
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 78306cba118e718a3b429695ac48846b9d9afeff)
This commit is contained in:
Stefan Roese 2018-05-29 15:28:54 +02:00 committed by Kever Yang
parent 829ac35b00
commit 5296618ae2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/ubi/build.c
View File

@ -1251,7 +1251,7 @@ int 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) {
pr_err("UBI error: too many MTD devices, maximum is %d", pr_err("UBI error: too many MTD devices, maximum is %d\n",
UBI_MAX_DEVICES); UBI_MAX_DEVICES);
return -EINVAL; return -EINVAL;
} }
@ -1263,7 +1263,7 @@ int ubi_init(void)
err = misc_register(&ubi_ctrl_cdev); err = misc_register(&ubi_ctrl_cdev);
if (err) { if (err) {
pr_err("UBI error: cannot register device"); pr_err("UBI error: cannot register device\n");
goto out; goto out;
} }
@ -1290,7 +1290,7 @@ int ubi_init(void)
mtd = open_mtd_device(p->name); mtd = open_mtd_device(p->name);
if (IS_ERR(mtd)) { if (IS_ERR(mtd)) {
err = PTR_ERR(mtd); err = PTR_ERR(mtd);
pr_err("UBI error: cannot open mtd %s, error %d", pr_err("UBI error: cannot open mtd %s, error %d\n",
p->name, err); p->name, err);
/* See comment below re-ubi_is_module(). */ /* See comment below re-ubi_is_module(). */
if (ubi_is_module()) if (ubi_is_module())
@ -1303,7 +1303,7 @@ int ubi_init(void)
p->vid_hdr_offs, p->max_beb_per1024); p->vid_hdr_offs, p->max_beb_per1024);
mutex_unlock(&ubi_devices_mutex); mutex_unlock(&ubi_devices_mutex);
if (err < 0) { if (err < 0) {
pr_err("UBI error: cannot attach mtd%d", pr_err("UBI error: cannot attach mtd%d\n",
mtd->index); mtd->index);
put_mtd_device(mtd); put_mtd_device(mtd);
@ -1327,7 +1327,7 @@ int ubi_init(void)
err = ubiblock_init(); err = ubiblock_init();
if (err) { if (err) {
pr_err("UBI error: block: cannot initialize, error %d", err); pr_err("UBI error: block: cannot initialize, error %d\n", err);
/* See comment above re-ubi_is_module(). */ /* See comment above re-ubi_is_module(). */
if (ubi_is_module()) if (ubi_is_module())
@ -1354,7 +1354,7 @@ out:
mtd_devs = 0; mtd_devs = 0;
#endif #endif
class_unregister(&ubi_class); class_unregister(&ubi_class);
pr_err("UBI error: cannot initialize UBI, error %d", err); pr_err("UBI error: cannot initialize UBI, error %d\n", err);
return err; return err;
} }
late_initcall(ubi_init); late_initcall(ubi_init);