UBI: Kill data type hint

We do not need this feature and to our shame it even was not working
and there was a bug found very recently.
	-- Artem Bityutskiy

Without the data type hint UBI2 (fastmap) will be easier to implement.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c
index 425bf5a3edd4..11a28f9ce0db 100644
--- a/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@ -186,14 +186,12 @@ int ubi_start_leb_change(struct ubi_device *ubi, struct ubi_volume *vol,
         dbg_gen("start changing LEB %d:%d, %u bytes",
                 vol->vol_id, req->lnum, req->bytes);
         if (req->bytes == 0)
-                return ubi_eba_atomic_leb_change(ubi, vol, req->lnum, NULL, 0,
-                                                 req->dtype);
+                return ubi_eba_atomic_leb_change(ubi, vol, req->lnum, NULL, 0);
 
         vol->upd_bytes = req->bytes;
         vol->upd_received = 0;
         vol->changing_leb = 1;
         vol->ch_lnum = req->lnum;
-        vol->ch_dtype = req->dtype;
 
         vol->upd_buf = vmalloc(req->bytes);
         if (!vol->upd_buf)
@@ -246,8 +244,7 @@ static int write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,
                         return 0;
                 }
 
-                err = ubi_eba_write_leb(ubi, vol, lnum, buf, 0, len,
-                                        UBI_UNKNOWN);
+                err = ubi_eba_write_leb(ubi, vol, lnum, buf, 0, len);
         } else {
                 /*
                  * When writing static volume, and this is the last logical
@@ -259,8 +256,7 @@ static int write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,
                  * contain zeros, not random trash.
                  */
                 memset(buf + len, 0, vol->usable_leb_size - len);
-                err = ubi_eba_write_leb_st(ubi, vol, lnum, buf, len,
-                                           UBI_UNKNOWN, used_ebs);
+                err = ubi_eba_write_leb_st(ubi, vol, lnum, buf, len, used_ebs);
         }
 
         return err;
@@ -421,7 +417,7 @@ int ubi_more_leb_change_data(struct ubi_device *ubi, struct ubi_volume *vol,
                        len - vol->upd_bytes);
                 len = ubi_calc_data_len(ubi, vol->upd_buf, len);
                 err = ubi_eba_atomic_leb_change(ubi, vol, vol->ch_lnum,
-                                                vol->upd_buf, len, UBI_UNKNOWN);
+                                                vol->upd_buf, len);
                 if (err)
                         return err;
         }