UBI: kill CONFIG_MTD_UBI_BEB_RESERVE

CONFIG_MTD_UBI_BEB_RESERVE and MIN_RESEVED_PEBS are no longer used,
since the amount of reserved eraseblocks for bad PEB handling is now
derived from 'ubi->bad_peb_limit' (ubi's maximum expected bad
eraseblocks).

Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 76195ac90e516b44c94332b686b3e841cbcbf6a9..b2f4f0f032f1912ec31eaaffb42d2fe17de84cf0 100644 (file)
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -27,22 +27,6 @@ config MTD_UBI_WL_THRESHOLD
          life-cycle less than 10000, the threshold should be lessened (e.g.,
          to 128 or 256, although it does not have to be power of 2).
 
-config MTD_UBI_BEB_RESERVE
-       int "Percentage of reserved eraseblocks for bad eraseblocks handling"
-       default 2
-       range 0 25
-       help
-         If the MTD device admits of bad eraseblocks (e.g. NAND flash), UBI
-         reserves some amount of physical eraseblocks to handle new bad
-         eraseblocks. When a physical eraseblock becomes bad, UBI uses these
-         reserved physical eraseblocks to relocate the bad one. This
-         configuration option specifies how many physical eraseblocks will be
-         reserved for bad eraseblock handling (percents of total number of
-         good physical eraseblocks on this MTD partition). If the underlying
-         flash does not admit of bad eraseblocks (e.g. NOR flash), this value
-         is ignored and nothing is reserved. Leave the default value if
-         unsure.
-
 config MTD_UBI_BEB_LIMIT
        int "Percentage of maximum expected bad eraseblocks"
        default 2

diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index aeb459eb7e4245d59826f473f327345d0fd452e9..c94612e67c47e2400ecdf736d2799e17527dce4a 100644 (file)
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -59,9 +59,6 @@
 #define ubi_err(fmt, ...) printk(KERN_ERR "UBI error: %s: " fmt "\n", \
                                 __func__, ##__VA_ARGS__)
 
-/* Lowest number PEBs reserved for bad PEB handling */
-#define MIN_RESEVED_PEBS 2
-
 /* Background thread name pattern */
 #define UBI_BGT_NAME_PATTERN "ubi_bgt%dd"