From: Troy Kisky <troy.kisky@boundarydevices.com>
To: alsa-devel@alsa-project.org
Cc: broonie@sirena.org.uk
Subject: Re: [PATCH 2/2] ASoC: Davinci: Fix race with cpu_dai->dma_data
Date: Fri, 11 Sep 2009 15:52:20 -0700 [thread overview]
Message-ID: <4AAAD4A4.6050608@boundarydevices.com> (raw)
In-Reply-To: <1252704543-25580-2-git-send-email-troy.kisky@boundarydevices.com>
Troy Kisky wrote:
> This patch removes references to cpu_dai->dma_data.
> It makes struct davinci_pcm_dma_params part of
> struct davinci_mcbsp_dev or struct davinci_audio_dev.
>
> It removes the unused name variable from davinci_pcm_dma_params.
>
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> ---
> sound/soc/davinci/davinci-i2s.c | 36 +++++++++---------------------
> sound/soc/davinci/davinci-mcasp.c | 44 ++++++++----------------------------
> sound/soc/davinci/davinci-mcasp.h | 7 +++++-
> sound/soc/davinci/davinci-pcm.c | 3 +-
> sound/soc/davinci/davinci-pcm.h | 1 -
> 5 files changed, 29 insertions(+), 62 deletions(-)
>
> diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
> index 002808b..359e99e 100644
> --- a/sound/soc/davinci/davinci-pcm.c
> +++ b/sound/soc/davinci/davinci-pcm.c
> @@ -238,7 +238,8 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream)
> struct davinci_runtime_data *prtd;
> int ret = 0;
> struct snd_soc_pcm_runtime *rtd = substream->private_data;
> - struct davinci_pcm_dma_params *params = rtd->dai->cpu_dai->dma_data;
> + struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->private_data;
> + struct davinci_pcm_dma_params *params = &pa[substream->stream];
> if (!params)
> return -ENODEV;
>
params can no longer be null, so the above 2 line can be deleted as well
next prev parent reply other threads:[~2009-09-11 22:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-11 21:29 [PATCH 1/2] ASoC: DaVinci: Fix divide by zero error during 1st execution Troy Kisky
2009-09-11 21:29 ` [PATCH 2/2] ASoC: Davinci: Fix race with cpu_dai->dma_data Troy Kisky
2009-09-11 22:52 ` Troy Kisky [this message]
2009-09-23 17:10 ` [PATCH 1/2] ASoC: DaVinci: Fix divide by zero error during 1st execution Mark Brown
2009-09-24 1:44 ` Troy Kisky
2009-09-24 14:36 ` Mark Brown
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=4AAAD4A4.6050608@boundarydevices.com \
--to=troy.kisky@boundarydevices.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@sirena.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox