From: Jean-Francois Moine <moinejf@free.fr>
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
linux-kernel@vger.kernel.org, Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCH 2/4] ASoC: simple-card: dynamically allocate the DAI link array
Date: Wed, 19 Feb 2014 19:07:41 +0100 [thread overview]
Message-ID: <41aa7354a6883f31afa60c21c2e14ecbb3bbb7e9.1392995566.git.moinejf@free.fr> (raw)
In-Reply-To: <cover.1392995566.git.moinejf@free.fr>
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
next prev parent reply other threads:[~2014-02-21 15:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 15:12 [PATCH 0/4] ASoC: simple-card: DT fix and multi DAI links extension Jean-Francois Moine
2014-02-21 15:12 ` Jean-Francois Moine
2014-02-19 18:07 ` Jean-Francois Moine [this message]
2014-02-24 3:32 ` [PATCH 2/4] ASoC: simple-card: dynamically allocate the DAI link array Li.Xiubo
2014-02-24 3:32 ` Li.Xiubo
2014-02-25 8:02 ` [alsa-devel] " Jean-Francois Moine
2014-02-20 17:25 ` [PATCH 1/4] ASoC: simple-card: Fix device node locks Jean-Francois Moine
2014-02-24 2:17 ` Li.Xiubo
2014-02-24 2:17 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
2014-02-25 7:30 ` Jean-Francois Moine
2014-02-25 7:30 ` Jean-Francois Moine
2014-02-25 12:42 ` Mark Brown
2014-02-25 12:42 ` Mark Brown
2014-02-21 8:56 ` [PATCH 3/4] ASoC: simple-card: accept many DAI links Jean-Francois Moine
2014-02-21 11:43 ` [PATCH 4/4] ASoC: simple-card: add DT documentation for multi-DAI links Jean-Francois Moine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41aa7354a6883f31afa60c21c2e14ecbb3bbb7e9.1392995566.git.moinejf@free.fr \
--to=moinejf@free.fr \
--cc=Li.Xiubo@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.