Skip to content

Commit 223274a

Browse files
lyakhlgirdwood
authored andcommitted
audio: base_fw: intel: fix return codes
Fix several return codes, a preprocessor conditional, and simplify a function. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 25ee30e commit 223274a

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

src/audio/base_fw_intel.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@ int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
124124

125125
struct sof_man_fw_desc *basefw_vendor_get_manifest(void)
126126
{
127-
struct sof_man_fw_desc *desc;
128-
129-
desc = (struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
130-
131-
return desc;
127+
return (struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
132128
}
133129

134130
int basefw_vendor_modules_info_get(uint32_t *data_offset, char *data)
@@ -137,7 +133,7 @@ int basefw_vendor_modules_info_get(uint32_t *data_offset, char *data)
137133
struct sof_man_fw_desc *desc = basefw_vendor_get_manifest();
138134

139135
if (!desc)
140-
return -EINVAL;
136+
return IPC4_ERROR_INVALID_PARAM;
141137

142138
module_info->modules_count = desc->header.num_module_entries;
143139

@@ -150,7 +146,7 @@ int basefw_vendor_modules_info_get(uint32_t *data_offset, char *data)
150146

151147
*data_offset = sizeof(*module_info) +
152148
module_info->modules_count * sizeof(module_info->modules[0]);
153-
return 0;
149+
return IPC4_SUCCESS;
154150
}
155151

156152
/* There are two types of sram memory : high power mode sram and
@@ -221,7 +217,7 @@ static int basefw_mem_state_info(uint32_t *data_offset, char *data)
221217
*data_offset = (int)((char *)tuple - data);
222218

223219
rfree(tuple_data);
224-
return 0;
220+
return IPC4_SUCCESS;
225221
}
226222

227223
static uint32_t basefw_get_ext_system_time(uint32_t *data_offset, char *data)
@@ -277,8 +273,9 @@ static uint32_t basefw_get_ext_system_time(uint32_t *data_offset, char *data)
277273
*data_offset = sizeof(struct ipc4_ext_system_time);
278274

279275
return IPC4_SUCCESS;
280-
#endif
276+
#else
281277
return IPC4_UNAVAILABLE;
278+
#endif
282279
}
283280

284281
int basefw_vendor_get_large_config(struct comp_dev *dev,
@@ -293,7 +290,7 @@ int basefw_vendor_get_large_config(struct comp_dev *dev,
293290

294291
extended_param_id.full = param_id;
295292

296-
uint32_t ret = -EINVAL;
293+
uint32_t ret = IPC4_ERROR_INVALID_PARAM;
297294

298295
switch (extended_param_id.part.parameter_type) {
299296
case IPC4_MEMORY_STATE_INFO_GET:
@@ -303,7 +300,7 @@ int basefw_vendor_get_large_config(struct comp_dev *dev,
303300
if (ret == IPC4_UNAVAILABLE) {
304301
tr_warn(&basefw_comp_tr,
305302
"returning success for get host EXTENDED_SYSTEM_TIME without handling it");
306-
return 0;
303+
return IPC4_SUCCESS;
307304
} else {
308305
return ret;
309306
}

0 commit comments

Comments
 (0)