github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: pcm6240: Use flexible array for config blocks

Browse Source 
Store the per-config block pointer table in the config allocation
instead of allocating it separately.

This ties the table to the config 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/20260511231313.31929-1-rosenp@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Rosen Penev 2026-05-11 16:13:13 -07:00 committed by Mark Brown
parent c84179a1d3
commit fea3df9eab
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sound/soc/codecs/pcm6240.c
View File

@ -1230,15 +1230,11 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
int *status)
{
struct pcmdevice_priv *pcm_dev = (struct pcmdevice_priv *)ctxt;
struct pcmdevice_config_info *cfg_info;
struct pcmdevice_config_info *cfg_info = NULL;
struct pcmdevice_block_data **bk_da;
char cfg_name[64] = {};
unsigned int config_offset = 0, i;
cfg_info = kzalloc_obj(struct pcmdevice_config_info);
if (!cfg_info) {
*status = -ENOMEM;
goto out;
}
unsigned int nblocks;
if (pcm_dev->regbin.fw_hdr.binary_version_num >= 0x105) {
if (config_offset + 64 > (int)config_size) {
@ -1247,7 +1243,7 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
"%s: cfg_name out of boundary\n", __func__);
goto out;
}
memcpy(cfg_info->cfg_name, &config_data[config_offset], 64);
memcpy(cfg_name, &config_data[config_offset], 64);
config_offset += 64;
}
@ -1257,16 +1253,17 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
__func__);
goto out;
}
cfg_info->nblocks =
get_unaligned_be32(&config_data[config_offset]);
nblocks = get_unaligned_be32(&config_data[config_offset]);
config_offset += 4;
bk_da = cfg_info->blk_data = kzalloc_objs(struct pcmdevice_block_data *,
cfg_info->nblocks);
if (!bk_da) {
cfg_info = kzalloc_flex(*cfg_info, blk_data, nblocks);
if (!cfg_info) {
*status = -ENOMEM;
goto out;
}
cfg_info->nblocks = nblocks;
memcpy(cfg_info->cfg_name, cfg_name, sizeof(cfg_info->cfg_name));
bk_da = cfg_info->blk_data;
cfg_info->real_nblocks = 0;
for (i = 0; i < cfg_info->nblocks; i++) {
if (config_offset + 12 > config_size) {
@ -1449,14 +1446,11 @@ static void pcmdevice_config_info_remove(void *ctxt)
for (i = 0; i < regbin->ncfgs; i++) {
if (!cfg_info[i])
continue;
if (cfg_info[i]->blk_data) {
for (j = 0; j < (int)cfg_info[i]->real_nblocks; j++) {
if (!cfg_info[i]->blk_data[j])
continue;
kfree(cfg_info[i]->blk_data[j]->regdata);
kfree(cfg_info[i]->blk_data[j]);
}
kfree(cfg_info[i]->blk_data);
for (j = 0; j < (int)cfg_info[i]->real_nblocks; j++) {
if (!cfg_info[i]->blk_data[j])
continue;
kfree(cfg_info[i]->blk_data[j]->regdata);
kfree(cfg_info[i]->blk_data[j]);
}
kfree(cfg_info[i]);
}

2
sound/soc/codecs/pcm6240.h
View File

@ -199,7 +199,7 @@ struct pcmdevice_config_info {
unsigned int nblocks;
unsigned int real_nblocks;
unsigned char active_dev;
struct pcmdevice_block_data **blk_data;
struct pcmdevice_block_data *blk_data[] __counted_by(nblocks);
};
struct pcmdevice_regbin {