ASoC: tegra: ADMAIF: allocate with a single kzalloc
Subsystems (3)
PATCH 1/1 ASoC: tegra: ADMAIF: allocate with a single kzalloc
---
Consolidate the allocations for capture_dma_data and playback_dma_data into a single kzalloc by using a flexible array member at the end of the tegra_admaif struct. This reduces the number of allocations from three to one, simplifies error handling, and improves memory locality.
sound/soc/tegra/tegra210_admaif.c | 28 ++++++++++------------------
sound/soc/tegra/tegra210_admaif.h | 2 +- sound/soc/tegra/tegra_isomgr_bw.c | 1 + 3 files changed, 12 insertions(+), 19 deletions(-)
sound/soc/tegra/tegra210_admaif.c +10 -18
@@ -11,6 +11,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include "tegra_isomgr_bw.h"
@@ -912,35 +913,26 @@ MODULE_DEVICE_TABLE(of, tegra_admaif_of_match);static int tegra_admaif_probe (struct platform_device *pdev) { +const struct tegra_admaif_soc_data *soc_data;struct tegra_admaif *admaif;void __iomem *regs;struct resource *res; +size_t alloc_size;int err, i; - admaif =devm_kzalloc (&pdev->dev,sizeof (*admaif),GFP_KERNEL ); + soc_data =of_device_get_match_data (&pdev->dev); + + alloc_size =struct_size (admaif, capture_dma_data, soc_data->num_ch); + alloc_size +=sizeof (*admaif->playback_dma_data) * soc_data->num_ch; + admaif =devm_kzalloc (&pdev->dev, alloc_size,GFP_KERNEL );if (!admaif)return -ENOMEM ; - admaif->soc_data =of_device_get_match_data (&pdev->dev); + admaif->playback_dma_data = admaif->capture_dma_data + soc_data->num_ch; + admaif->soc_data = soc_data;dev_set_drvdata (&pdev->dev, admaif); - admaif->capture_dma_data = -devm_kcalloc (&pdev->dev, - admaif->soc_data->num_ch, -sizeof (struct snd_dmaengine_dai_dma_data ), -GFP_KERNEL ); -if (!admaif->capture_dma_data) -return -ENOMEM ; - - admaif->playback_dma_data = -devm_kcalloc (&pdev->dev, - admaif->soc_data->num_ch, -sizeof (struct snd_dmaengine_dai_dma_data ), -GFP_KERNEL ); -if (!admaif->playback_dma_data) -return -ENOMEM ; -for (i =0 ; i <ADMAIF_PATHS ; i++) { admaif->mono_to_stereo[i] = devm_kcalloc(&pdev->dev, admaif->soc_data->num_ch,
sound/soc/tegra/tegra210_admaif.h +1 -1
@@ -229,13 +229,13 @@ struct tegra_admaif_soc_data { };struct tegra_admaif { -struct snd_dmaengine_dai_dma_data *capture_dma_data;struct snd_dmaengine_dai_dma_data *playback_dma_data;const struct tegra_admaif_soc_data *soc_data;unsigned int *mono_to_stereo[ADMAIF_PATHS ];unsigned int *stereo_to_mono[ADMAIF_PATHS ];struct regmap *regmap;struct tegra_adma_isomgr *adma_isomgr; +struct snd_dmaengine_dai_dma_data capture_dma_data[]; };#endif
sound/soc/tegra/tegra_isomgr_bw.c +1 -0
@@ -6,6 +6,7 @@#include <linux/interconnect.h> #include <linux/module.h> +#include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> #include "tegra_isomgr_bw.h"
Signature · 1 line
2.54.0
Mark Brown
maintainerQuoted 7 lines · Rosen Penev
Signed-off-by Rosen Penev <[email protected]>---
Consolidate the allocations forcapture_dma_dataandplayback_dma_datainto a single kzalloc by using a flexible array member at the end of thetegra_admaifstruct. This reduces the number of allocations from three to one, simplifies error handling, and improves memory locality.
Why is the changelog for this included after the --- as something to be removed from the commit?
Quoted 10 lines · Mark Brown
Quoted 7 lines · Rosen Penev
Signed-off-by Rosen Penev <[email protected]>---
Consolidate the allocations forcapture_dma_dataandplayback_dma_datainto a single kzalloc by using a flexible array member at the end of thetegra_admaifstruct. This reduces the number of allocations from three to one, simplifies error handling, and improves memory locality.
Quoted 2 lines
Why is the changelog for this included after the --- as something to be removed from the commit?
Me being careless. That is, it was written after git format-patch. Will resend.