UBI: use own macros for the layout volume
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>
This commit is contained in:
parent
4a59c797a1
commit
1f4f43475f
|
@ -322,7 +322,7 @@ retry:
|
||||||
goto out_free;
|
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->vol_id = cpu_to_be32(UBI_LAYOUT_VOLUME_ID);
|
||||||
vid_hdr->compat = UBI_LAYOUT_VOLUME_COMPAT;
|
vid_hdr->compat = UBI_LAYOUT_VOLUME_COMPAT;
|
||||||
vid_hdr->data_size = vid_hdr->used_ebs =
|
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;
|
return -ENOMEM;
|
||||||
|
|
||||||
vol->reserved_pebs = UBI_LAYOUT_VOLUME_EBS;
|
vol->reserved_pebs = UBI_LAYOUT_VOLUME_EBS;
|
||||||
vol->alignment = 1;
|
vol->alignment = UBI_LAYOUT_VOLUME_ALIGN;
|
||||||
vol->vol_type = UBI_DYNAMIC_VOLUME;
|
vol->vol_type = UBI_DYNAMIC_VOLUME;
|
||||||
vol->name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;
|
vol->name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;
|
||||||
memcpy(vol->name, UBI_LAYOUT_VOLUME_NAME, vol->name_len + 1);
|
memcpy(vol->name, UBI_LAYOUT_VOLUME_NAME, vol->name_len + 1);
|
||||||
|
|
Loading…
Reference in New Issue