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>

diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h
index 64b5eed501ff5ee28af86da2691c6e1b7a1881b3..b69d9ab0bc46abc0ad6ad4ed4a0e1f723ef1200b 100644 (file)
--- 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 2f19bd7ad52c9c64ccbd645d95ff218e29e28e59..100f557405faf59db771de0e457fae7582723f10 100644 (file)
--- 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;