Messages in this thread Patch in this message | | | From | Jean-Francois Moine <> | Date | Wed, 19 Feb 2014 19:07:41 +0100 | Subject | [PATCH 2/4] ASoC: simple-card: dynamically allocate the DAI link array |
| |
The DAI link array is hard-coded as a single CPU / CODEC DAIs link.
This patch allocates this array with the card definition and facilitates handling more links.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> --- sound/soc/generic/simple-card.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 8809ab4..a75a8bb 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -20,7 +20,6 @@ struct simple_card_data { unsigned int daifmt; struct asoc_simple_dai cpu_dai; struct asoc_simple_dai codec_dai; - struct snd_soc_dai_link snd_link; }; static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, @@ -246,7 +245,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; int ret; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + priv = devm_kzalloc(dev, + sizeof(*priv) + sizeof(*dai_link), + GFP_KERNEL); if (!priv) return -ENOMEM; @@ -255,7 +256,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) */ priv->snd_card.owner = THIS_MODULE; priv->snd_card.dev = dev; - dai_link = &priv->snd_link; + dai_link = (struct snd_soc_dai_link *) (priv + 1); priv->snd_card.dai_link = dai_link; priv->snd_card.num_links = 1; -- 1.9.0
| |