diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /drivers/mtd/ubi | |
parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'drivers/mtd/ubi')
-rw-r--r-- | drivers/mtd/ubi/eba.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/io.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/scan.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/ubi-media.h | 4 | ||||
-rw-r--r-- | drivers/mtd/ubi/vtbl.c | 2 | ||||
-rw-r--r-- | drivers/mtd/ubi/wl.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 048a606cebde..25def348e5ba 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
@@ -717,7 +717,7 @@ write_error: | |||
717 | * to the real data size, although the @buf buffer has to contain the | 717 | * to the real data size, although the @buf buffer has to contain the |
718 | * alignment. In all other cases, @len has to be aligned. | 718 | * alignment. In all other cases, @len has to be aligned. |
719 | * | 719 | * |
720 | * It is prohibited to write more then once to logical eraseblocks of static | 720 | * It is prohibited to write more than once to logical eraseblocks of static |
721 | * volumes. This function returns zero in case of success and a negative error | 721 | * volumes. This function returns zero in case of success and a negative error |
722 | * code in case of failure. | 722 | * code in case of failure. |
723 | */ | 723 | */ |
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index a74118c05745..fe81039f2a7c 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c | |||
@@ -465,7 +465,7 @@ out: | |||
465 | * This function synchronously erases physical eraseblock @pnum. If @torture | 465 | * This function synchronously erases physical eraseblock @pnum. If @torture |
466 | * flag is not zero, the physical eraseblock is checked by means of writing | 466 | * flag is not zero, the physical eraseblock is checked by means of writing |
467 | * different patterns to it and reading them back. If the torturing is enabled, | 467 | * different patterns to it and reading them back. If the torturing is enabled, |
468 | * the physical eraseblock is erased more then once. | 468 | * the physical eraseblock is erased more than once. |
469 | * | 469 | * |
470 | * This function returns the number of erasures made in case of success, %-EIO | 470 | * This function returns the number of erasures made in case of success, %-EIO |
471 | * if the erasure failed or the torturing test failed, and other negative error | 471 | * if the erasure failed or the torturing test failed, and other negative error |
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 41d47e1cf15c..ecde202a5a12 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c | |||
@@ -478,7 +478,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si, | |||
478 | return 0; | 478 | return 0; |
479 | } else { | 479 | } else { |
480 | /* | 480 | /* |
481 | * This logical eraseblock is older then the one found | 481 | * This logical eraseblock is older than the one found |
482 | * previously. | 482 | * previously. |
483 | */ | 483 | */ |
484 | if (cmp_res & 4) | 484 | if (cmp_res & 4) |
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h index 2ad940409053..8419fdccc79c 100644 --- a/drivers/mtd/ubi/ubi-media.h +++ b/drivers/mtd/ubi/ubi-media.h | |||
@@ -135,7 +135,7 @@ enum { | |||
135 | * The erase counter header takes 64 bytes and has a plenty of unused space for | 135 | * The erase counter header takes 64 bytes and has a plenty of unused space for |
136 | * future usage. The unused fields are zeroed. The @version field is used to | 136 | * future usage. The unused fields are zeroed. The @version field is used to |
137 | * indicate the version of UBI implementation which is supposed to be able to | 137 | * indicate the version of UBI implementation which is supposed to be able to |
138 | * work with this UBI image. If @version is greater then the current UBI | 138 | * work with this UBI image. If @version is greater than the current UBI |
139 | * version, the image is rejected. This may be useful in future if something | 139 | * version, the image is rejected. This may be useful in future if something |
140 | * is changed radically. This field is duplicated in the volume identifier | 140 | * is changed radically. This field is duplicated in the volume identifier |
141 | * header. | 141 | * header. |
@@ -187,7 +187,7 @@ struct ubi_ec_hdr { | |||
187 | * (sequence number) is used to distinguish between older and newer versions of | 187 | * (sequence number) is used to distinguish between older and newer versions of |
188 | * logical eraseblocks. | 188 | * logical eraseblocks. |
189 | * | 189 | * |
190 | * There are 2 situations when there may be more then one physical eraseblock | 190 | * There are 2 situations when there may be more than one physical eraseblock |
191 | * corresponding to the same logical eraseblock, i.e., having the same @vol_id | 191 | * corresponding to the same logical eraseblock, i.e., having the same @vol_id |
192 | * and @lnum values in the volume identifier header. Suppose we have a logical | 192 | * and @lnum values in the volume identifier header. Suppose we have a logical |
193 | * eraseblock L and it is mapped to the physical eraseblock P. | 193 | * eraseblock L and it is mapped to the physical eraseblock P. |
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 333c8941552f..1afc61e7455d 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c | |||
@@ -577,7 +577,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si, | |||
577 | if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) { | 577 | if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) { |
578 | /* Auto re-size flag may be set only for one volume */ | 578 | /* Auto re-size flag may be set only for one volume */ |
579 | if (ubi->autoresize_vol_id != -1) { | 579 | if (ubi->autoresize_vol_id != -1) { |
580 | ubi_err("more then one auto-resize volume (%d " | 580 | ubi_err("more than one auto-resize volume (%d " |
581 | "and %d)", ubi->autoresize_vol_id, i); | 581 | "and %d)", ubi->autoresize_vol_id, i); |
582 | kfree(vol); | 582 | kfree(vol); |
583 | return -EINVAL; | 583 | return -EINVAL; |
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 14901cb82c18..891534f8210d 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c | |||
@@ -128,7 +128,7 @@ | |||
128 | * situation when the picked physical eraseblock is constantly erased after the | 128 | * situation when the picked physical eraseblock is constantly erased after the |
129 | * data is written to it. So, we have a constant which limits the highest erase | 129 | * data is written to it. So, we have a constant which limits the highest erase |
130 | * counter of the free physical eraseblock to pick. Namely, the WL sub-system | 130 | * counter of the free physical eraseblock to pick. Namely, the WL sub-system |
131 | * does not pick eraseblocks with erase counter greater then the lowest erase | 131 | * does not pick eraseblocks with erase counter greater than the lowest erase |
132 | * counter plus %WL_FREE_MAX_DIFF. | 132 | * counter plus %WL_FREE_MAX_DIFF. |
133 | */ | 133 | */ |
134 | #define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD) | 134 | #define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD) |
@@ -917,7 +917,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi) | |||
917 | /* | 917 | /* |
918 | * We schedule wear-leveling only if the difference between the | 918 | * We schedule wear-leveling only if the difference between the |
919 | * lowest erase counter of used physical eraseblocks and a high | 919 | * lowest erase counter of used physical eraseblocks and a high |
920 | * erase counter of free physical eraseblocks is greater then | 920 | * erase counter of free physical eraseblocks is greater than |
921 | * %UBI_WL_THRESHOLD. | 921 | * %UBI_WL_THRESHOLD. |
922 | */ | 922 | */ |
923 | e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb); | 923 | e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb); |