part: rename disk_partition_type_uuid()

Rename disk_partition_type_uuid to disk_partition_type_guid.

Provide function descriptions for the getter and setter.

Fixes: bcd645428c ("part: Add accessors for struct disk_partition type_uuid")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2023-09-02 09:35:21 +02:00 committed by Tom Rini
parent 7cc1d87d7e
commit 782c7f1bdb
2 changed files with 24 additions and 4 deletions

View file

@ -299,7 +299,7 @@ int part_get_info_efi(struct blk_desc *desc, int part,
} }
if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) { if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) {
uuid_bin_to_str(gpt_pte[part - 1].partition_type_guid.b, uuid_bin_to_str(gpt_pte[part - 1].partition_type_guid.b,
(char *)disk_partition_type_uuid(info), (char *)disk_partition_type_guid(info),
UUID_STR_FORMAT_GUID); UUID_STR_FORMAT_GUID);
} }

View file

@ -108,18 +108,38 @@ static inline void disk_partition_clr_uuid(struct disk_partition *info)
} }
/* Accessors for struct disk_partition field ->type_guid */ /* Accessors for struct disk_partition field ->type_guid */
extern char *__invalid_use_of_disk_partition_type_uuid; extern char *__invalid_use_of_disk_partition_type_guid;
/**
* disk_partition_type_guid() - get partition type GUID
*
* By using this function to get the partition type GUID we can use
* 'if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID))' instead of
* '#ifdef CONFIG_PARTITION_TYPE_GUID'.
*
* @info: partition information
* Return: partition type GUID
*/
static inline const static inline const
char *disk_partition_type_uuid(const struct disk_partition *info) char *disk_partition_type_guid(const struct disk_partition *info)
{ {
#ifdef CONFIG_PARTITION_TYPE_GUID #ifdef CONFIG_PARTITION_TYPE_GUID
return info->type_guid; return info->type_guid;
#else #else
return __invalid_use_of_disk_partition_type_uuid; return __invalid_use_of_disk_partition_type_guid;
#endif #endif
} }
/**
* disk_partition_set_type_guid() - set partition type GUID
*
* By using this function to set the partition type GUID we can use
* 'if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID))' instead of
* '#ifdef CONFIG_PARTITION_TYPE_GUID'.
*
* @info: partition information
* @val: partition type GUID as string
*/
static inline void disk_partition_set_type_guid(struct disk_partition *info, static inline void disk_partition_set_type_guid(struct disk_partition *info,
const char *val) const char *val)
{ {