Skip to content

Commit 194a4ef

Browse files
torvaldstorvalds
committed
Merge tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI updates from Richard Weinberger: "Minor improvements" * tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs: UBI: Fix two typos in comments ubi: fastmap: fix spelling mistake: "invalidiate" -> "invalidate" ubi: pr_err() strings should end with newlines ubi: pr_err() strings should end with newlines ubi: pr_err() strings should end with newlines
2 parents 2896b80 + 89b68cd commit 194a4ef

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎drivers/mtd/ubi/block.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
383383
/* Initialize the gendisk of this ubiblock device */
384384
gd = alloc_disk(1);
385385
if (!gd) {
386-
pr_err("UBI: block: alloc_disk failed");
386+
pr_err("UBI: block: alloc_disk failed\n");
387387
ret = -ENODEV;
388388
goto out_free_dev;
389389
}
@@ -607,7 +607,7 @@ static void __init ubiblock_create_from_param(void)
607607
desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);
608608
if (IS_ERR(desc)) {
609609
pr_err(
610-
"UBI: block: can't open volume on ubi%d_%d, err=%ld",
610+
"UBI: block: can't open volume on ubi%d_%d, err=%ld\n",
611611
p->ubi_num, p->vol_id, PTR_ERR(desc));
612612
continue;
613613
}
@@ -618,7 +618,7 @@ static void __init ubiblock_create_from_param(void)
618618
ret = ubiblock_create(&vi);
619619
if (ret) {
620620
pr_err(
621-
"UBI: block: can't add '%s' volume on ubi%d_%d, err=%d",
621+
"UBI: block: can't add '%s' volume on ubi%d_%d, err=%d\n",
622622
vi.name, p->ubi_num, p->vol_id, ret);
623623
continue;
624624
}

‎drivers/mtd/ubi/build.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
825825
for (i = 0; i < UBI_MAX_DEVICES; i++) {
826826
ubi = ubi_devices[i];
827827
if (ubi && mtd->index == ubi->mtd->index) {
828-
pr_err("ubi: mtd%d is already attached to ubi%d",
828+
pr_err("ubi: mtd%d is already attached to ubi%d\n",
829829
mtd->index, i);
830830
return -EEXIST;
831831
}
@@ -840,7 +840,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
840840
* no sense to attach emulated MTD devices, so we prohibit this.
841841
*/
842842
if (mtd->type == MTD_UBIVOLUME) {
843-
pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI",
843+
pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI\n",
844844
mtd->index);
845845
return -EINVAL;
846846
}
@@ -851,7 +851,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
851851
if (!ubi_devices[ubi_num])
852852
break;
853853
if (ubi_num == UBI_MAX_DEVICES) {
854-
pr_err("ubi: only %d UBI devices may be created",
854+
pr_err("ubi: only %d UBI devices may be created\n",
855855
UBI_MAX_DEVICES);
856856
return -ENFILE;
857857
}
@@ -861,7 +861,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
861861

862862
/* Make sure ubi_num is not busy */
863863
if (ubi_devices[ubi_num]) {
864-
pr_err("ubi: ubi%i already exists", ubi_num);
864+
pr_err("ubi: ubi%i already exists\n", ubi_num);
865865
return -EEXIST;
866866
}
867867
}
@@ -1166,7 +1166,7 @@ static int __init ubi_init(void)
11661166
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);
11671167

11681168
if (mtd_devs > UBI_MAX_DEVICES) {
1169-
pr_err("UBI error: too many MTD devices, maximum is %d",
1169+
pr_err("UBI error: too many MTD devices, maximum is %d\n",
11701170
UBI_MAX_DEVICES);
11711171
return -EINVAL;
11721172
}
@@ -1178,7 +1178,7 @@ static int __init ubi_init(void)
11781178

11791179
err = misc_register(&ubi_ctrl_cdev);
11801180
if (err) {
1181-
pr_err("UBI error: cannot register device");
1181+
pr_err("UBI error: cannot register device\n");
11821182
goto out;
11831183
}
11841184

@@ -1205,7 +1205,7 @@ static int __init ubi_init(void)
12051205
mtd = open_mtd_device(p->name);
12061206
if (IS_ERR(mtd)) {
12071207
err = PTR_ERR(mtd);
1208-
pr_err("UBI error: cannot open mtd %s, error %d",
1208+
pr_err("UBI error: cannot open mtd %s, error %d\n",
12091209
p->name, err);
12101210
/* See comment below re-ubi_is_module(). */
12111211
if (ubi_is_module())
@@ -1218,7 +1218,7 @@ static int __init ubi_init(void)
12181218
p->vid_hdr_offs, p->max_beb_per1024);
12191219
mutex_unlock(&ubi_devices_mutex);
12201220
if (err < 0) {
1221-
pr_err("UBI error: cannot attach mtd%d",
1221+
pr_err("UBI error: cannot attach mtd%d\n",
12221222
mtd->index);
12231223
put_mtd_device(mtd);
12241224

@@ -1242,7 +1242,7 @@ static int __init ubi_init(void)
12421242

12431243
err = ubiblock_init();
12441244
if (err) {
1245-
pr_err("UBI error: block: cannot initialize, error %d", err);
1245+
pr_err("UBI error: block: cannot initialize, error %d\n", err);
12461246

12471247
/* See comment above re-ubi_is_module(). */
12481248
if (ubi_is_module())
@@ -1265,7 +1265,7 @@ static int __init ubi_init(void)
12651265
misc_deregister(&ubi_ctrl_cdev);
12661266
out:
12671267
class_unregister(&ubi_class);
1268-
pr_err("UBI error: cannot initialize UBI, error %d", err);
1268+
pr_err("UBI error: cannot initialize UBI, error %d\n", err);
12691269
return err;
12701270
}
12711271
late_initcall(ubi_init);

‎drivers/mtd/ubi/fastmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ int ubi_update_fastmap(struct ubi_device *ubi)
16671667

16681668
ret = invalidate_fastmap(ubi);
16691669
if (ret < 0) {
1670-
ubi_err(ubi, "Unable to invalidiate current fastmap!");
1670+
ubi_err(ubi, "Unable to invalidate current fastmap!");
16711671
ubi_ro_mode(ubi);
16721672
} else {
16731673
return_fm_pebs(ubi, old_fm);

‎drivers/mtd/ubi/ubi-media.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ struct ubi_ec_hdr {
229229
* copy. UBI also calculates data CRC when the data is moved and stores it at
230230
* the @data_crc field of the copy (P1). So when UBI needs to pick one physical
231231
* eraseblock of two (P or P1), the @copy_flag of the newer one (P1) is
232-
* examined. If it is cleared, the situation* is simple and the newer one is
232+
* examined. If it is cleared, the situation is simple and the newer one is
233233
* picked. If it is set, the data CRC of the copy (P1) is examined. If the CRC
234234
* checksum is correct, this physical eraseblock is selected (P1). Otherwise
235235
* the older one (P) is selected.
@@ -389,7 +389,7 @@ struct ubi_vtbl_record {
389389
#define UBI_FM_POOL_MAGIC 0x67AF4D08
390390
#define UBI_FM_EBA_MAGIC 0xf0c040a8
391391

392-
/* A fastmap supber block can be located between PEB 0 and
392+
/* A fastmap super block can be located between PEB 0 and
393393
* UBI_FM_MAX_START */
394394
#define UBI_FM_MAX_START 64
395395

0 commit comments

Comments
 (0)