aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-06-14 08:00:18 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-06-14 08:02:38 +0300
commitf8925c17b43d84cb6f56106e4ee2e10ee16b1a2a (patch)
treefbae585bec988f0190461de2ca42c3402c3b4dc1
parent772f5e08faa9d2b5677aa6e01fce06860186a49f (diff)
libubi: remove few fields from volume info
Remove the 'dev_major' and 'dev_minor' fields from the volume information structure, because these fields should be provided by the device information structure. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--ubi-utils/include/libubi.h4
-rw-r--r--ubi-utils/src/libubi.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h
index 64b5eed..b69d9ab 100644
--- a/ubi-utils/include/libubi.h
+++ b/ubi-utils/include/libubi.h
@@ -139,8 +139,6 @@ struct ubi_dev_info
* @vol_id: ID of this volume
* @major: major number of corresponding volume character device
* @minor: minor number of corresponding volume character device
- * @dev_major: major number of corresponding UBI device character device
- * @dev_minor: minor number of corresponding UBI device character device
* @type: volume type (%UBI_DYNAMIC_VOLUME or %UBI_STATIC_VOLUME)
* @alignment: alignment of this volume
* @data_bytes: how many data bytes are stored on this volume (equivalent to
@@ -158,8 +156,6 @@ struct ubi_vol_info
int vol_id;
int major;
int minor;
- int dev_major;
- int dev_minor;
int type;
int alignment;
long long data_bytes;
diff --git a/ubi-utils/src/libubi.c b/ubi-utils/src/libubi.c
index 2f19bd7..100f557 100644
--- a/ubi-utils/src/libubi.c
+++ b/ubi-utils/src/libubi.c
@@ -1249,8 +1249,6 @@ int ubi_get_vol_info1(libubi_t desc, int dev_num, int vol_id,
info->dev_num = dev_num;
info->vol_id = vol_id;
- if (dev_get_major(lib, dev_num, &info->dev_major, &info->dev_minor))
- return -1;
if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor))
return -1;