From 054a8aadb1413585876471cd112bd8eb72c8158f Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Mon, 14 May 2012 17:55:52 +0200
Subject: [PATCH] --- yaml --- r: 305153 b: refs/heads/master c:
 a65a0eb6d198e058687a9214683bd1c418f20d39 h: refs/heads/master i:   305151:
 19a987b541cab7be76d8bdb054989b08c0713595 v: v3

---
 [refs]                       |  2 +-
 trunk/include/mtd/ubi-user.h | 23 ++---------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 5d643aca4d30..b92043197f3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36a261e8c0ab323d04db9cdd1f6bb4c273c4b32
+refs/heads/master: a65a0eb6d198e058687a9214683bd1c418f20d39
diff --git a/trunk/include/mtd/ubi-user.h b/trunk/include/mtd/ubi-user.h
index 3c4109777aff..370c750115ce 100644
--- a/trunk/include/mtd/ubi-user.h
+++ b/trunk/include/mtd/ubi-user.h
@@ -195,23 +195,6 @@
 /* Maximum amount of UBI volumes that can be re-named at one go */
 #define UBI_MAX_RNVOL 32
 
-/*
- * UBI data type hint constants.
- *
- * UBI_LONGTERM: long-term data
- * UBI_SHORTTERM: short-term data
- * UBI_UNKNOWN: data persistence is unknown
- *
- * These constants are used when data is written to UBI volumes in order to
- * help the UBI wear-leveling unit to find more appropriate physical
- * eraseblocks.
- */
-enum {
-	UBI_LONGTERM  = 1,
-	UBI_SHORTTERM = 2,
-	UBI_UNKNOWN   = 3,
-};
-
 /*
  * UBI volume type constants.
  *
@@ -375,25 +358,23 @@ struct ubi_rnvol_req {
  *                             requests.
  * @lnum: logical eraseblock number to change
  * @bytes: how many bytes will be written to the logical eraseblock
- * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN)
  * @padding: reserved for future, not used, has to be zeroed
  */
 struct ubi_leb_change_req {
 	__s32 lnum;
 	__s32 bytes;
-	__s8  dtype;
+	__s8  dtype; /* obsolete, do not use! */
 	__s8  padding[7];
 } __packed;
 
 /**
  * struct ubi_map_req - a data structure used in map LEB requests.
  * @lnum: logical eraseblock number to unmap
- * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN)
  * @padding: reserved for future, not used, has to be zeroed
  */
 struct ubi_map_req {
 	__s32 lnum;
-	__s8  dtype;
+	__s8  dtype; /* obsolete, do not use! */
 	__s8  padding[3];
 } __packed;