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>

diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index d846777e7462b301f6fc3c3b11dc81174099d3f1..0674fd854cc8bdd1ab1678babedc2c137a5aad53 100644 (file)
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -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)

diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
index 8ec656cf8848c70c56bbb64ca9742a1a33ce0c85..40af7329587a12c3f6facfeb601059a867794fe8 100644 (file)
--- a/sound/pci/asihpi/hpicmn.h
+++ b/sound/pci/asihpi/hpicmn.h
@@ -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);