doc: replace @return by Return:

Sphinx expects Return: and not @return to indicate a return value.

find . -name '*.c' -exec \
sed -i 's/^\(\s\)\*\(\s*\)@return\(\s\)/\1*\2Return:\3/' {} \;

find . -name '*.h' -exec \
sed -i 's/^\(\s\)\*\(\s*\)@return\(\s\)/\1*\2Return:\3/' {} \;

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

32 files changed, 86 insertions, 86 deletions

diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index b5f2cebbde..1b838fdbd6 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -27,7 +27,7 @@
  * @buf: Buffer to hold the path
  * @buf_len: Length of buffer
  * @cur: Current position in the buffer
- * @return new position in buffer after adding @dev, or -ve on error
+ * Return: new position in buffer after adding @dev, or -ve on error
  */
 static int acpi_device_path_fill(const struct udevice *dev, char *buf,
 				 size_t buf_len, int cur)
@@ -97,7 +97,7 @@ enum acpi_dev_status acpi_device_status(const struct udevice *dev)
  *
  * Write a forward length for a large resource (2 bytes)
  *
- * @return pointer to the zero word (for fixing up later)
+ * Return: pointer to the zero word (for fixing up later)
  */
 static void *largeres_write_len_f(struct acpi_ctx *ctx)
 {
@@ -597,7 +597,7 @@ static void acpi_device_write_i2c(struct acpi_ctx *ctx,
  * @dev: I2C device to convert
  * @i2c: Place to put the new structure
  * @scope: Scope of the I2C device (this is the controller path)
- * @return chip address of device
+ * Return: chip address of device
  */
 static int acpi_device_set_i2c(const struct udevice *dev, struct acpi_i2c *i2c,
 			       const char *scope)
@@ -719,7 +719,7 @@ static void acpi_device_write_spi(struct acpi_ctx *ctx, const struct acpi_spi *s
  * @dev: SPI device to convert
  * @spi: Place to put the new structure
  * @scope: Scope of the SPI device (this is the controller path)
- * @return 0 (always)
+ * Return: 0 (always)
  */
 static int acpi_device_set_spi(const struct udevice *dev, struct acpi_spi *spi,
 			       const char *scope)
diff --git a/lib/binman.c b/lib/binman.c
index 530df6a4b4..cfe1e5f807 100644
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -37,7 +37,7 @@ static struct binman_info *binman;
  * depends on whether multiple-images is in use.
  *
  * @nodep: Returns the node found, on success
- * @return 0 if OK, , -EINVAL if there is no /binman node, -ECHILD if multiple
+ * Return: 0 if OK, , -EINVAL if there is no /binman node, -ECHILD if multiple
  * images are being used but the first image is not available
  */
 static int find_image_node(ofnode *nodep)
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 6980933d7e..1e5606c7b8 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -79,7 +79,7 @@ int efi_get_mmap(struct efi_mem_desc **descp, int *sizep, uint *keyp,
  * @device_path: EFI device path structure for this
  * @len: Length of @device_path in bytes
  * @devp: Returns the bound device
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int efi_bind_block(efi_handle_t handle, struct efi_block_io *blkio,
 		   struct efi_device_path *device_path, int len,
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 646cde3214..a35fce1385 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -152,7 +152,7 @@ static inline unsigned long read_cr3(void)
  * EFI we must first change to 32-bit mode. To do this we need to find the
  * correct code segment to use (an entry in the Global Descriptor Table).
  *
- * @return code segment GDT offset, or 0 for 32-bit EFI, -ENOENT if not found
+ * Return: code segment GDT offset, or 0 for 32-bit EFI, -ENOENT if not found
  */
 static int get_codeseg32(void)
 {
diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
index a62c34009c..83f025e1ca 100644
--- a/lib/efi_loader/efi_acpi.c
+++ b/lib/efi_loader/efi_acpi.c
@@ -15,7 +15,7 @@ static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
 /*
  * Install the ACPI table as a configuration table.
  *
- * @return	status code
+ * Return:	status code
  */
 efi_status_t efi_acpi_register(void)
 {
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 735ed0bd0f..c61f485933 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -51,7 +51,7 @@ static const struct efi_device_path_vendor ROOT = {
  * Determine if an MMC device is an SD card.
  *
  * @desc	block device descriptor
- * @return	true if the device is an SD card
+ * Return:	true if the device is an SD card
  */
 static bool is_sd(struct blk_desc *desc)
 {
@@ -223,7 +223,7 @@ struct efi_object *efi_dp_find_obj(struct efi_device_path *dp,
  * Determine the last device path node that is not the end node.
  *
  * @dp		device path
- * @return	last node before the end node if it exists
+ * Return:	last node before the end node if it exists
  *		otherwise NULL
  */
 const struct efi_device_path *efi_dp_last_node(const struct efi_device_path *dp)
@@ -572,7 +572,7 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev)
  *
  * @buf		pointer to the end of the device path
  * @dev		device
- * @return	pointer to the end of the device path
+ * Return:	pointer to the end of the device path
  */
 __maybe_unused static void *dp_fill(void *buf, struct udevice *dev)
 {
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index 57fa9d97f7..d8a83c8849 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -225,7 +225,7 @@ static char *dp_msging(char *s, struct efi_device_path *dp)
  *
  * @s		output buffer
  * @dp		device path node
- * @return	next unused buffer address
+ * Return:	next unused buffer address
  */
 static char *dp_media(char *s, struct efi_device_path *dp)
 {
@@ -310,7 +310,7 @@ static char *dp_media(char *s, struct efi_device_path *dp)
  *
  * @buffer		output buffer
  * @dp			device path or node
- * @return		end of string
+ * Return:		end of string
  */
 static char *efi_convert_single_device_node_to_text(
 		char *buffer,
@@ -350,7 +350,7 @@ static char *efi_convert_single_device_node_to_text(
  * device_node		device node to be converted
  * display_only		true if the shorter text representation shall be used
  * allow_shortcuts	true if shortcut forms may be used
- * @return		text representation of the device path
+ * Return:		text representation of the device path
  *			NULL if out of memory of device_path is NULL
  */
 static uint16_t EFIAPI *efi_convert_device_node_to_text(
@@ -383,7 +383,7 @@ out:
  * device_path		device path to be converted
  * display_only		true if the shorter text representation shall be used
  * allow_shortcuts	true if shortcut forms may be used
- * @return		text representation of the device path
+ * Return:		text representation of the device path
  *			NULL if out of memory of device_path is NULL
  */
 static uint16_t EFIAPI *efi_convert_device_path_to_text(
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
index 94015329c8..a07d9bab3a 100644
--- a/lib/efi_loader/efi_device_path_utilities.c
+++ b/lib/efi_loader/efi_device_path_utilities.c
@@ -22,7 +22,7 @@ const efi_guid_t efi_guid_device_path_utilities_protocol =
  * for details.
  *
  * @device_path		device path
- * @return		size in bytes
+ * Return:		size in bytes
  */
 static efi_uintn_t EFIAPI get_device_path_size(
 	const struct efi_device_path *device_path)
@@ -50,7 +50,7 @@ static efi_uintn_t EFIAPI get_device_path_size(
  * for details.
  *
  * @device_path		device path
- * @return		copy of the device path
+ * Return:		copy of the device path
  */
 static struct efi_device_path * EFIAPI duplicate_device_path(
 	const struct efi_device_path *device_path)
@@ -70,7 +70,7 @@ static struct efi_device_path * EFIAPI duplicate_device_path(
  *
  * @src1		1st device path
  * @src2		2nd device path
- * @return		concatenated device path
+ * Return:		concatenated device path
  */
 static struct efi_device_path * EFIAPI append_device_path(
 	const struct efi_device_path *src1,
@@ -91,7 +91,7 @@ static struct efi_device_path * EFIAPI append_device_path(
  *
  * @device_path		device path
  * @device_node		device node
- * @return		concatenated device path
+ * Return:		concatenated device path
  */
 static struct efi_device_path * EFIAPI append_device_node(
 	const struct efi_device_path *device_path,
@@ -112,7 +112,7 @@ static struct efi_device_path * EFIAPI append_device_node(
  *
  * @device_path			1st device path
  * @device_path_instance	2nd device path
- * @return			concatenated device path
+ * Return:			concatenated device path
  */
 static struct efi_device_path * EFIAPI append_device_path_instance(
 	const struct efi_device_path *device_path,
@@ -134,7 +134,7 @@ static struct efi_device_path * EFIAPI append_device_path_instance(
  *
  * @device_path_instance	next device path instance
  * @device_path_instance_size	size of the device path instance
- * @return			concatenated device path
+ * Return:			concatenated device path
  */
 static struct efi_device_path * EFIAPI get_next_device_path_instance(
 	struct efi_device_path **device_path_instance,
@@ -156,7 +156,7 @@ static struct efi_device_path * EFIAPI get_next_device_path_instance(
  *
  * @device_path		device path
  * @device_node		device node
- * @return		concatenated device path
+ * Return:		concatenated device path
  */
 static bool EFIAPI is_device_path_multi_instance(
 	const struct efi_device_path *device_path)
@@ -177,7 +177,7 @@ static bool EFIAPI is_device_path_multi_instance(
  * @node_type		node type
  * @node_sub_type	node sub type
  * @node_length		node length
- * @return		device path node
+ * Return:		device path node
  */
 static struct efi_device_path * EFIAPI create_device_node(
 	uint8_t node_type, uint8_t node_sub_type, uint16_t node_length)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 7f0b507281..1c51a3fc45 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -452,7 +452,7 @@ static uint64_t efi_find_free_memory(uint64_t len, uint64_t max_addr)
  * @memory_type		usage type of the allocated memory
  * @pages		number of pages to be allocated
  * @memory		allocated memory
- * @return		status code
+ * Return:		status code
  */
 efi_status_t efi_allocate_pages(enum efi_allocate_type type,
 				enum efi_memory_type memory_type,
@@ -680,7 +680,7 @@ efi_status_t efi_free_pool(void *buffer)
  * @map_key		key for the memory map
  * @descriptor_size	size of an individual memory descriptor
  * @descriptor_version	version number of the memory descriptor structure
- * @return		status code
+ * Return:		status code
  */
 efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
 				struct efi_mem_desc *memory_map,
diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index fc0b23397c..306c0bc54f 100644
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -16,7 +16,7 @@
 /*
  * Install the SMBIOS table as a configuration table.
  *
- * @return	status code
+ * Return:	status code
  */
 efi_status_t efi_smbios_register(void)
 {
diff --git a/lib/efi_selftest/dtbdump.c b/lib/efi_selftest/dtbdump.c
index f6ddaa3072..ed3b985cab 100644
--- a/lib/efi_selftest/dtbdump.c
+++ b/lib/efi_selftest/dtbdump.c
@@ -160,7 +160,7 @@ static efi_status_t efi_input(u16 *buffer, efi_uintn_t buffer_size)
  * Convert FDT value to host endianness.
  *
  * @val		FDT value
- * @return	converted value
+ * Return:	converted value
  */
 static u32 f2h(fdt32_t val)
 {
diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index 39ee2edf5d..3da34b1d46 100644
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -75,7 +75,7 @@ void efi_st_exit_boot_services(void)
  *
  * @test	the test to be executed
  * @failures	counter that will be incremented if a failure occurs
- * @return	EFI_ST_SUCCESS for success
+ * Return:	EFI_ST_SUCCESS for success
  */
 static int setup(struct efi_unit_test *test, unsigned int *failures)
 {
@@ -100,7 +100,7 @@ static int setup(struct efi_unit_test *test, unsigned int *failures)
  *
  * @test	the test to be executed
  * @failures	counter that will be incremented if a failure occurs
- * @return	EFI_ST_SUCCESS for success
+ * Return:	EFI_ST_SUCCESS for success
  */
 static int execute(struct efi_unit_test *test, unsigned int *failures)
 {
@@ -125,7 +125,7 @@ static int execute(struct efi_unit_test *test, unsigned int *failures)
  *
  * @test	the test to be torn down
  * @failures	counter that will be incremented if a failure occurs
- * @return	EFI_ST_SUCCESS for success
+ * Return:	EFI_ST_SUCCESS for success
  */
 static int teardown(struct efi_unit_test *test, unsigned int *failures)
 {
diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c
index 15f03751ac..ad53dac796 100644
--- a/lib/efi_selftest/efi_selftest_block_device.c
+++ b/lib/efi_selftest/efi_selftest_block_device.c
@@ -57,7 +57,7 @@ static u8 *image;
  * Reset service of the block IO protocol.
  *
  * @this	block IO protocol
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t EFIAPI reset(
 			struct efi_block_io *this,
@@ -74,7 +74,7 @@ static efi_status_t EFIAPI reset(
  * @lba		start of the read in logical blocks
  * @buffer_size	number of bytes to read
  * @buffer	target buffer
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t EFIAPI read_blocks(
 			struct efi_block_io *this, u32 media_id, u64 lba,
@@ -99,7 +99,7 @@ static efi_status_t EFIAPI read_blocks(
  * @lba		start of the write in logical blocks
  * @buffer_size	number of bytes to read
  * @buffer	source buffer
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t EFIAPI write_blocks(
 			struct efi_block_io *this, u32 media_id, u64 lba,
@@ -120,7 +120,7 @@ static efi_status_t EFIAPI write_blocks(
  * Flush service of the block IO protocol.
  *
  * @this	block IO protocol
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t EFIAPI flush_blocks(struct efi_block_io *this)
 {
@@ -131,7 +131,7 @@ static efi_status_t EFIAPI flush_blocks(struct efi_block_io *this)
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
@@ -278,7 +278,7 @@ static int teardown(void)
  * Get length of device path without end tag.
  *
  * @dp		device path
- * @return	length of device path in bytes
+ * Return:	length of device path in bytes
  */
 static efi_uintn_t dp_size(struct efi_device_path *dp)
 {
diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c
index 38720bb63d..d2bbd1c4f6 100644
--- a/lib/efi_selftest/efi_selftest_controllers.c
+++ b/lib/efi_selftest/efi_selftest_controllers.c
@@ -35,7 +35,7 @@ static efi_handle_t handle_driver;
  * @handle	handle on which child controllers are installed
  * @protocol	protocol for which the child controllers were installed
  * @count	number of child controllers
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t count_child_controllers(efi_handle_t handle,
 					    efi_guid_t *protocol,
@@ -69,7 +69,7 @@ static efi_status_t count_child_controllers(efi_handle_t handle,
  * @this			driver binding protocol
  * @controller_handle		handle of the controller
  * @remaining_device_path	path specifying the child controller
- * @return			status code
+ * Return:			status code
  */
 static efi_status_t EFIAPI supported(
 		struct efi_driver_binding_protocol *this,
@@ -106,7 +106,7 @@ static efi_status_t EFIAPI supported(
  * @this			driver binding protocol
  * @controller_handle		handle of the controller
  * @remaining_device_path	path specifying the child controller
- * @return			status code
+ * Return:			status code
  */
 static efi_status_t EFIAPI start(
 		struct efi_driver_binding_protocol *this,
@@ -161,7 +161,7 @@ static efi_status_t EFIAPI start(
  *
  * @controller_handle	parent controller
  * @child_handle	child controller
- * @return		status code
+ * Return:		status code
  */
 static efi_status_t disconnect_child(efi_handle_t controller_handle,
 				     efi_handle_t child_handle)
@@ -191,7 +191,7 @@ static efi_status_t disconnect_child(efi_handle_t controller_handle,
  * @controller_handle		handle of the controller
  * @number_of_children		number of child controllers to remove
  * @child_handle_buffer		handles of the child controllers to remove
- * @return			status code
+ * Return:			status code
  */
 static efi_status_t EFIAPI stop(
 		struct efi_driver_binding_protocol *this,
diff --git a/lib/efi_selftest/efi_selftest_exception.c b/lib/efi_selftest/efi_selftest_exception.c
index 6e900a35dc..d86228a892 100644
--- a/lib/efi_selftest/efi_selftest_exception.c
+++ b/lib/efi_selftest/efi_selftest_exception.c
@@ -63,7 +63,7 @@ static u8 *image;
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c
index 412ba286ea..739f029b8c 100644
--- a/lib/efi_selftest/efi_selftest_fdt.c
+++ b/lib/efi_selftest/efi_selftest_fdt.c
@@ -51,7 +51,7 @@ static uint32_t f2h(fdt32_t val)
  *
  * @property	name of the property
  * @node	name of the node or NULL for root node
- * @return	value of the property
+ * Return:	value of the property
  */
 static char *get_property(const u16 *property, const u16 *node)
 {
diff --git a/lib/efi_selftest/efi_selftest_load_file.c b/lib/efi_selftest/efi_selftest_load_file.c
index 4473e7c36e..bf955cbf66 100644
--- a/lib/efi_selftest/efi_selftest_load_file.c
+++ b/lib/efi_selftest/efi_selftest_load_file.c
@@ -166,7 +166,7 @@ struct efi_device_path *dp_lf2_file_remainder = &dp_lf2_file.f.dp;
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c
index 06a87df862..4975d80ff1 100644
--- a/lib/efi_selftest/efi_selftest_loadimage.c
+++ b/lib/efi_selftest/efi_selftest_loadimage.c
@@ -370,7 +370,7 @@ static efi_status_t EFIAPI flush(struct efi_file_handle *this)
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
diff --git a/lib/efi_selftest/efi_selftest_miniapp_exception.c b/lib/efi_selftest/efi_selftest_miniapp_exception.c
index 59b7e5100a..9be0e7e3eb 100644
--- a/lib/efi_selftest/efi_selftest_miniapp_exception.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_exception.c
@@ -15,7 +15,7 @@
  *
  * @handle	handle of the loaded image
  * @systable	system table
- * @return	status code
+ * Return:	status code
  */
 efi_status_t EFIAPI efi_main(efi_handle_t handle,
 			     struct efi_system_table *systable)
diff --git a/lib/efi_selftest/efi_selftest_miniapp_return.c b/lib/efi_selftest/efi_selftest_miniapp_return.c
index 5709e39cac..25a2bd1637 100644
--- a/lib/efi_selftest/efi_selftest_miniapp_return.c
+++ b/lib/efi_selftest/efi_selftest_miniapp_return.c
@@ -16,7 +16,7 @@
  *
  * @handle	handle of the loaded image
  * @systable	system table
- * @return	status code
+ * Return:	status code
  */
 efi_status_t EFIAPI efi_main(efi_handle_t handle,
 			     struct efi_system_table *systable)
diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c
index 11207b8162..5d4c0a6972 100644
--- a/lib/efi_selftest/efi_selftest_startimage_exit.c
+++ b/lib/efi_selftest/efi_selftest_startimage_exit.c
@@ -43,7 +43,7 @@ static u8 *image;
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
diff --git a/lib/efi_selftest/efi_selftest_startimage_return.c b/lib/efi_selftest/efi_selftest_startimage_return.c
index fabf53d983..44c23644ea 100644
--- a/lib/efi_selftest/efi_selftest_startimage_return.c
+++ b/lib/efi_selftest/efi_selftest_startimage_return.c
@@ -43,7 +43,7 @@ static u8 *image;
  * Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
diff --git a/lib/efi_selftest/efi_selftest_tcg2.c b/lib/efi_selftest/efi_selftest_tcg2.c
index c5b0b7dd02..2eed588eea 100644
--- a/lib/efi_selftest/efi_selftest_tcg2.c
+++ b/lib/efi_selftest/efi_selftest_tcg2.c
@@ -401,7 +401,7 @@ static struct boot_variable boot_variable_test[] = {
  * efi_status_t decompress() - Decompress the disk image.
  *
  * @image	decompressed disk image
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t decompress(u8 **image)
 {
@@ -438,7 +438,7 @@ static efi_status_t decompress(u8 **image)
  * Preexisting variable values are saved and will be restored by
  * calling restore_boot_variable().
  *
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t setup_boot_variable(void)
 {
@@ -494,7 +494,7 @@ static efi_status_t setup_boot_variable(void)
  *
  * Restore the variable values saved in setup_boot_variable().
  *
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t restore_boot_variable(void)
 {
@@ -536,7 +536,7 @@ static efi_status_t restore_boot_variable(void)
  * void *find_smbios_table() - Find smbios table
  *
  * @systable	system table
- * @return	status code
+ * Return:	status code
  */
 static void *find_smbios_table(const struct efi_system_table *systable)
 {
@@ -554,7 +554,7 @@ static void *find_smbios_table(const struct efi_system_table *systable)
  * efi_status_t setup_smbios_table() - Prepare the dummy SMBIOS table
  *
  * @systable	system table
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t setup_smbios_table(const struct efi_system_table *systable)
 {
@@ -676,7 +676,7 @@ static int efi_st_tcg2_setup(const efi_handle_t img_handle,
  *
  * @tcg2		tcg2 protocol
  * @manufacturer_id	pointer to the manufacturer_id
- * @return		status code
+ * Return:		status code
  */
 static efi_status_t get_manufacturer_id(struct efi_tcg2_protocol *tcg2, u32 *manufacturer_id)
 {
@@ -716,7 +716,7 @@ static efi_status_t get_manufacturer_id(struct efi_tcg2_protocol *tcg2, u32 *man
  *
  * @tcg2		tcg2 protocol
  * @manufacturer_id	pointer to the manufacturer_id
- * @return		status code
+ * Return:		status code
  */
 static efi_status_t get_manufacturer_id_buffer_small(struct efi_tcg2_protocol *tcg2)
 {
@@ -742,7 +742,7 @@ static efi_status_t get_manufacturer_id_buffer_small(struct efi_tcg2_protocol *t
  *
  * @tcg2	tcg2 protocol
  * @idx		pcr index to read
- * @return	status code
+ * Return:	status code
  */
 static efi_status_t read_pcr(struct efi_tcg2_protocol *tcg2, u32 idx)
 {
@@ -779,7 +779,7 @@ static efi_status_t read_pcr(struct efi_tcg2_protocol *tcg2, u32 idx)
 /**
  * int validate_pcrs() - Compare the expected and actual pcrs
  *
- * @return	status code
+ * Return:	status code
  */
 static int validate_pcrs(void)
 {
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 280cda61a7..87aa677a4a 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -656,7 +656,7 @@ int fdtdec_lookup_phandle(const void *blob, int node, const char *prop_name)
  * @param min_len	minimum property length in bytes
  * @param err		0 if ok, or -FDT_ERR_NOTFOUND if the property is not
 			found, or -FDT_ERR_BADLAYOUT if not enough data
- * @return pointer to cell, which is only valid if err == 0
+ * Return: pointer to cell, which is only valid if err == 0
  */
 static const void *get_prop_check_min_len(const void *blob, int node,
 					  const char *prop_name, int min_len,
@@ -1219,7 +1219,7 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
 /**
  * fdt_find_separate() - Find a devicetree at the end of the image
  *
- * @return pointer to FDT blob
+ * Return: pointer to FDT blob
  */
 static void *fdt_find_separate(void)
 {
diff --git a/lib/of_live.c b/lib/of_live.c
index 05a45ed34a..2cb0dd9c07 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -257,7 +257,7 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset,
  * can be used.
  * @blob: The blob to expand
  * @mynodes: The device_node tree created by the call
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 static int unflatten_device_tree(const void *blob,
 				 struct device_node **mynodes)
diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c
index 74f9eb16cc..d259b2aedf 100644
--- a/lib/rsa/rsa-mod-exp.c
+++ b/lib/rsa/rsa-mod-exp.c
@@ -59,7 +59,7 @@ static void subtract_modulus(const struct rsa_public_key *key, uint32_t num[])
  *
  * @key:	Key containing modulus to check
  * @num:	Number to check against modulus, as little endian word array
- * @return 0 if num < modulus, 1 if num >= modulus
+ * Return: 0 if num < modulus, 1 if num >= modulus
  */
 static int greater_equal_modulus(const struct rsa_public_key *key,
 				 uint32_t num[])
@@ -315,7 +315,7 @@ int rsa_mod_exp_sw(const uint8_t *sig, uint32_t sig_len,
  *
  * @keyptr:	RSA key
  * @inout:	Big-endian word array containing value and result
- * @return 0 on successful calculation, otherwise failure error code
+ * Return: 0 on successful calculation, otherwise failure error code
  *
  * FIXME: Use pow_mod() instead of zynq_pow_mod()
  *        pow_mod calculation required for zynq is bit different from
diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c
index 3b6e5f0f86..a95a3d2748 100644
--- a/lib/rsa/rsa-sign.c
+++ b/lib/rsa/rsa-sign.c
@@ -38,7 +38,7 @@ static int rsa_err(const char *msg)
  * @keydir:	Directory containins the key
  * @name	Name of key file (will have a .crt extension)
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_pem_get_pub_key(const char *keydir, const char *name, EVP_PKEY **evpp)
 {
@@ -96,7 +96,7 @@ err_cert:
  * @name	Name of key
  * @engine	Engine to use
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_engine_get_pub_key(const char *keydir, const char *name,
 				  ENGINE *engine, EVP_PKEY **evpp)
@@ -156,7 +156,7 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name,
  * @name	Name of key file (will have a .crt extension)
  * @engine	Engine to use
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_get_pub_key(const char *keydir, const char *name,
 			   ENGINE *engine, EVP_PKEY **evpp)
@@ -172,7 +172,7 @@ static int rsa_get_pub_key(const char *keydir, const char *name,
  * @keydir:	Directory containing the key
  * @name	Name of key file (will have a .key extension)
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_pem_get_priv_key(const char *keydir, const char *name,
 				const char *keyfile, EVP_PKEY **evpp)
@@ -215,7 +215,7 @@ static int rsa_pem_get_priv_key(const char *keydir, const char *name,
  * @name	Name of key
  * @engine	Engine to use
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_engine_get_priv_key(const char *keydir, const char *name,
 				   const char *keyfile,
@@ -283,7 +283,7 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name,
  * @name	Name of key
  * @engine	Engine to use for signing
  * @evpp	Returns EVP_PKEY object, or NULL on failure
- * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL)
+ * Return: 0 if ok, -ve on error (in which case *evpp will be set to NULL)
  */
 static int rsa_get_priv_key(const char *keydir, const char *name,
 			    const char *keyfile, ENGINE *engine, EVP_PKEY **evpp)
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 83f7564101..fbb2d35a7d 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -47,7 +47,7 @@
  * @msg:	Padded message
  * @pad_len:	Number of expected padding bytes
  * @algo:	Checksum algo structure having information on DER encoding etc.
- * @return 0 on success, != 0 on failure
+ * Return: 0 on success, != 0 on failure
  */
 static int rsa_verify_padding(const uint8_t *msg, const int pad_len,
 			      struct checksum_algo *algo)
@@ -122,7 +122,7 @@ static void u32_i2osp(uint32_t val, uint8_t *buf)
  * @seed_len:	Size of the input octet string
  * @output:	Specifies the output octet string
  * @output_len:	Size of the output octet string
- * @return 0 if the octet string was correctly generated, others on error
+ * Return: 0 if the octet string was correctly generated, others on error
  */
 static int mask_generation_function1(struct checksum_algo *checksum,
 				     uint8_t *seed, int seed_len,
@@ -325,7 +325,7 @@ U_BOOT_PADDING_ALGO(pss) = {
  * @sig_len:	Number of bytes in signature
  * @hash:	Pointer to the expected hash
  * @key_len:	Number of bytes in rsa key
- * @return 0 if verified, -ve on error
+ * Return: 0 if verified, -ve on error
  */
 static int rsa_verify_key(struct image_sign_info *info,
 			  struct key_prop *prop, const uint8_t *sig,
@@ -437,7 +437,7 @@ int rsa_verify_with_pkey(struct image_sign_info *info,
  * @sig:	Signature
  * @sig_len:	Number of bytes in signature
  * @node:	Node having the RSA Key properties
- * @return 0 if verified, -ve on error
+ * Return: 0 if verified, -ve on error
  */
 static int rsa_verify_with_keynode(struct image_sign_info *info,
 				   const void *hash, uint8_t *sig,
diff --git a/lib/strto.c b/lib/strto.c
index 7bba1e3e54..f191884376 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -42,7 +42,7 @@ static const char *_parse_integer_fixup_radix(const char *s, uint *basep)
  * This ignore case
  *
  * @ch: Character to convert (expects '0'..'9', 'a'..'f' or 'A'..'F')
- * @return value of digit (0..0xf) or 255 if the character is invalid
+ * Return: value of digit (0..0xf) or 255 if the character is invalid
  */
 static uint decode_digit(int ch)
 {
diff --git a/lib/tpm-utils.h b/lib/tpm-utils.h
index d680d14088..a519e18235 100644
--- a/lib/tpm-utils.h
+++ b/lib/tpm-utils.h
@@ -31,7 +31,7 @@
  * @param size		size of output string
  * @param format	format string
  * @param ...		data points
- * @return 0 on success, non-0 on error
+ * Return: 0 on success, non-0 on error
  */
 int pack_byte_string(u8 *str, size_t size, const char *format, ...);
 
@@ -46,7 +46,7 @@ int pack_byte_string(u8 *str, size_t size, const char *format, ...);
  * @param size		size of output string
  * @param format	format string
  * @param ...		data points
- * @return 0 on success, non-0 on error
+ * Return: 0 on success, non-0 on error
  */
 int unpack_byte_string(const u8 *str, size_t size, const char *format, ...);
 
@@ -54,7 +54,7 @@ int unpack_byte_string(const u8 *str, size_t size, const char *format, ...);
  * Get TPM command size.
  *
  * @param command	byte string of TPM command
- * @return command size of the TPM command
+ * Return: command size of the TPM command
  */
 u32 tpm_command_size(const void *command);
 
@@ -62,7 +62,7 @@ u32 tpm_command_size(const void *command);
  * Get TPM response return code, which is one of TPM_RESULT values.
  *
  * @param response	byte string of TPM response
- * @return return code of the TPM response
+ * Return: return code of the TPM response
  */
 u32 tpm_return_code(const void *response);
 
@@ -76,7 +76,7 @@ u32 tpm_return_code(const void *response);
  * @param size_ptr	output buffer size (input parameter) and TPM
  *			response length (output parameter); this parameter
  *			is a bidirectional
- * @return return code of the TPM response
+ * Return: return code of the TPM response
  */
 u32 tpm_sendrecv_command(struct udevice *dev, const void *command,
 			 void *response, size_t *size_ptr);
diff --git a/lib/zstd/bitstream.h b/lib/zstd/bitstream.h
index 73aacc97f4..44abfd5eb2 100644
--- a/lib/zstd/bitstream.h
+++ b/lib/zstd/bitstream.h
@@ -127,7 +127,7 @@ static const unsigned BIT_mask[] = {0,       1,       3,       7,	0xF,      0x1F
 ****************************************************************/
 /*! BIT_initCStream() :
  *  `dstCapacity` must be > sizeof(void*)
- *  @return : 0 if success,
+ *  Return: 0 if success,
 			  otherwise an error code (can be tested using ERR_isError() ) */
 ZSTD_STATIC size_t BIT_initCStream(BIT_CStream_t *bitC, void *startPtr, size_t dstCapacity)
 {
@@ -184,7 +184,7 @@ ZSTD_STATIC void BIT_flushBits(BIT_CStream_t *bitC)
 }
 
 /*! BIT_closeCStream() :
- *  @return : size of CStream, in bytes,
+ *  Return: size of CStream, in bytes,
 			  or 0 if it could not fit into dstBuffer */
 ZSTD_STATIC size_t BIT_closeCStream(BIT_CStream_t *bitC)
 {
@@ -259,7 +259,7 @@ ZSTD_STATIC size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits) { ret
  *  local register is not modified.
  *  On 32-bits, maxNbBits==24.
  *  On 64-bits, maxNbBits==56.
- *  @return : value extracted
+ *  Return: value extracted
  */
 ZSTD_STATIC size_t BIT_lookBits(const BIT_DStream_t *bitD, U32 nbBits)
 {
@@ -280,7 +280,7 @@ ZSTD_STATIC void BIT_skipBits(BIT_DStream_t *bitD, U32 nbBits) { bitD->bitsConsu
 /*! BIT_readBits() :
  *  Read (consume) next n bits from local register and update.
  *  Pay attention to not read more than nbBits contained into local register.
- *  @return : extracted value.
+ *  Return: extracted value.
  */
 ZSTD_STATIC size_t BIT_readBits(BIT_DStream_t *bitD, U32 nbBits)
 {
diff --git a/lib/zstd/decompress.c b/lib/zstd/decompress.c
index ae3be3f02a..edfddd817e 100644
--- a/lib/zstd/decompress.c
+++ b/lib/zstd/decompress.c
@@ -306,7 +306,7 @@ unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize)
  *  compatible with legacy mode
  *  `srcSize` must be the exact length of some number of ZSTD compressed and/or
  *      skippable frames
- *  @return : decompressed size of the frames contained */
+ *  Return: decompressed size of the frames contained */
 unsigned long long ZSTD_findDecompressedSize(const void *src, size_t srcSize)
 {
 	{
@@ -1497,7 +1497,7 @@ size_t ZSTD_generateNxBytes(void *dst, size_t dstCapacity, BYTE byte, size_t len
  *  compatible with legacy mode
  *  `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame
  *  `srcSize` must be at least as large as the frame contained
- *  @return : the compressed size of the frame starting at `src` */
+ *  Return: the compressed size of the frame starting at `src` */
 size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize)
 {
 	if (srcSize >= ZSTD_skippableHeaderSize && (ZSTD_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) {
@@ -1860,7 +1860,7 @@ static size_t ZSTD_refDictContent(ZSTD_DCtx *dctx, const void *dict, size_t dict
 
 /* ZSTD_loadEntropy() :
  * dict : must point at beginning of a valid zstd dictionary
- * @return : size of entropy tables read */
+ * Return: size of entropy tables read */
 static size_t ZSTD_loadEntropy(ZSTD_entropyTables_t *entropy, const void *const dict, size_t const dictSize)
 {
 	const BYTE *dictPtr = (const BYTE *)dict;