ALSA: asihpi: Use flexible array for control cache

Store the ASIHPI control-cache lookup table in the control-cache
allocation instead of allocating it separately.

This keeps the lookup table tied to the cache object lifetime and
removes the extra allocation and free path.

Assisted-by: Codex:GPT-5.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20260511230121.28606-1-rosenp@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rosen Penev 2026-05-11 16:01:21 -07:00 committed by Takashi Iwai
parent 57cd11e788
commit 3aec8baeb5
2 changed files with 6 additions and 14 deletions

View File

@ -641,17 +641,12 @@ void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,
struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
const u32 size_in_bytes, u8 *p_dsp_control_buffer)
{
struct hpi_control_cache *p_cache = kmalloc_obj(*p_cache);
struct hpi_control_cache *p_cache;
p_cache = kzalloc_flex(*p_cache, p_info, control_count);
if (!p_cache)
return NULL;
p_cache->p_info =
kzalloc_objs(*p_cache->p_info, control_count);
if (!p_cache->p_info) {
kfree(p_cache);
return NULL;
}
p_cache->cache_size_in_bytes = size_in_bytes;
p_cache->control_count = control_count;
p_cache->p_cache = p_dsp_control_buffer;
@ -661,10 +656,7 @@ struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
void hpi_free_control_cache(struct hpi_control_cache *p_cache)
{
if (p_cache) {
kfree(p_cache->p_info);
kfree(p_cache);
}
kfree(p_cache);
}
static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)

View File

@ -37,10 +37,10 @@ struct hpi_control_cache {
u16 adap_idx;
u32 control_count;
u32 cache_size_in_bytes;
/** pointer to allocated memory of lookup pointers. */
struct hpi_control_cache_info **p_info;
/** pointer to DSP's control cache. */
u8 *p_cache;
/** pointer to allocated memory of lookup pointers. */
struct hpi_control_cache_info *p_info[] __counted_by(control_count);
};
struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index);