ASoC: SOF: topology: use kzalloc_flex
Subsystems (3)
PATCH 1/1 ASoC: SOF: topology: use kzalloc_flex
Simplify allocation by using a flexible array member.
Add __counted_by for extra runtime analysis.
--- sound/soc/sof/sof-audio.h | 2 +- sound/soc/sof/topology.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-)
sound/soc/sof/sof-audio.h +1 -1
@@ -411,11 +411,11 @@ struct snd_sof_dai_link {struct snd_sof_tuple *tuples;int num_tuples;struct snd_soc_dai_link *link; -struct snd_soc_tplg_hw_config *hw_configs;int num_hw_configs;int default_hw_cfg_id;int type;struct list_head list; + struct snd_soc_tplg_hw_config hw_configs[] __counted_by(num_hw_configs); };/* ASoC SOF DAPM widget */
sound/soc/sof/topology.c +2 -12
@@ -1908,18 +1908,12 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_return -EINVAL ; } - slink =kzalloc_obj (*slink); + slink =kzalloc_flex (*slink, hw_configs,le32_to_cpu (cfg->num_hw_configs));if (!slink)return -ENOMEM ; slink->num_hw_configs =le32_to_cpu (cfg->num_hw_configs); - slink->hw_configs =kmemdup_array (cfg->hw_config, - slink->num_hw_configs,sizeof (*slink->hw_configs), -GFP_KERNEL ); -if (!slink->hw_configs) { -kfree (slink); -return -ENOMEM ; - } +memcpy (slink->hw_configs, cfg->hw_config,le32_to_cpu (cfg->num_hw_configs) *sizeof (*slink->hw_configs)); slink->default_hw_cfg_id =le32_to_cpu (cfg->default_hw_config_id); slink->link = link;
@@ -1932,7 +1926,6 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_ private->array, le32_to_cpu(private->size));if (ret <0 ) {dev_err (scomp->dev,"Failed tp parse common DAI link tokens\n" ); -kfree (slink->hw_configs);kfree (slink);return ret; }
@@ -2003,7 +1996,6 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_/* allocate memory for tuples array */ slink->tuples =kzalloc_objs (*slink->tuples, num_tuples);if (!slink->tuples) { -kfree (slink->hw_configs);kfree (slink);return -ENOMEM ; }
@@ -2061,7 +2053,6 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_ err:kfree (slink->tuples); -kfree (slink->hw_configs);kfree (slink);return ret;
@@ -2078,7 +2069,6 @@ static int sof_link_unload(struct snd_soc_component *scomp, struct snd_soc_dobjkfree (slink->tuples);list_del (&slink->list); -kfree (slink->hw_configs);kfree (slink); dobj->private =NULL ;
Signature · 1 line
2.53.0
Mark Brown
maintainerQuoted 1 line · Rosen Penev
ASoC: SOF: topology: use
kzalloc_flex
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1
Thanks!
[1/1] ASoC: SOF: topology: use kzalloc_flex
https://git.kernel.org/broonie/sound/c/d3d75c767680
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark