UBI: use own macros for the layout volume
authorRichard Weinberger <richard@nod.at>
Tue, 10 Jan 2012 16:57:03 +0000 (17:57 +0100)
committerArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Sun, 15 Jan 2012 13:08:55 +0000 (15:08 +0200)
This is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and
UBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -
use them.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
drivers/mtd/ubi/vtbl.c

index 890754c9f3272a490c360c8e6e8d67d194839a32..17cec0c0154448d85271a4422ac8907f9dedc00d 100644 (file)
@@ -322,7 +322,7 @@ retry:
                goto out_free;
        }
 
-       vid_hdr->vol_type = UBI_VID_DYNAMIC;
+       vid_hdr->vol_type = UBI_LAYOUT_VOLUME_TYPE;
        vid_hdr->vol_id = cpu_to_be32(UBI_LAYOUT_VOLUME_ID);
        vid_hdr->compat = UBI_LAYOUT_VOLUME_COMPAT;
        vid_hdr->data_size = vid_hdr->used_ebs =
@@ -632,7 +632,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                return -ENOMEM;
 
        vol->reserved_pebs = UBI_LAYOUT_VOLUME_EBS;
-       vol->alignment = 1;
+       vol->alignment = UBI_LAYOUT_VOLUME_ALIGN;
        vol->vol_type = UBI_DYNAMIC_VOLUME;
        vol->name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;
        memcpy(vol->name, UBI_LAYOUT_VOLUME_NAME, vol->name_len + 1);