From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-kernel@vger.kernel.org
Cc: linux-sh@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
Magnus Damm <magnus.damm@gmail.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
linux-mmc@vger.kernel.org, alsa-devel@alsa-project.org,
linux-serial@vger.kernel.org, Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH 6/7 v2] ASoC: SIU: prepare for conversion to simple DMA
Date: Thu, 26 Jan 2012 15:56:23 +0100 [thread overview]
Message-ID: <1327589784-4287-7-git-send-email-g.liakhovetski@gmx.de> (raw)
In-Reply-To: <1327589784-4287-1-git-send-email-g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
sound/soc/sh/siu_pcm.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 0193e59..414bb35 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *slave)
{
struct sh_dmae_slave *param = slave;
- pr_debug("%s: slave ID %d\n", __func__, param->slave_id);
+ pr_debug("%s: slave ID %d\n", __func__, param->simple_slave.slave_id);
if (unlikely(param->dma_dev != chan->device->dev))
return false;
- chan->private = param;
+ chan->private = ¶m->simple_slave;
return true;
}
@@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
siu_stream = &port_info->playback;
param = &siu_stream->param;
- param->slave_id = port ? pdata->dma_slave_tx_b :
+ param->simple_slave.slave_id = port ? pdata->dma_slave_tx_b :
pdata->dma_slave_tx_a;
} else {
siu_stream = &port_info->capture;
param = &siu_stream->param;
- param->slave_id = port ? pdata->dma_slave_rx_b :
+ param->simple_slave.slave_id = port ? pdata->dma_slave_rx_b :
pdata->dma_slave_rx_a;
}
--
1.7.2.5
next prev parent reply other threads:[~2012-01-26 14:56 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-26 14:56 [PATCH 0/7 v2] extract a simple dmaengine library from shdma.c Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 1/7 v2] dmaengine: add a simple dma library Guennadi Liakhovetski
2012-01-26 17:34 ` [alsa-devel] " Sascha Hauer
2012-01-26 21:07 ` Guennadi Liakhovetski
2012-01-27 8:37 ` Shimoda, Yoshihiro
2012-01-27 8:48 ` Guennadi Liakhovetski
2012-01-31 11:03 ` Shimoda, Yoshihiro
2012-02-01 0:52 ` Guennadi Liakhovetski
2012-02-01 2:47 ` Shimoda, Yoshihiro
2012-02-02 22:19 ` Guennadi Liakhovetski
2012-02-03 8:47 ` Shimoda, Yoshihiro
2012-02-03 10:21 ` Guennadi Liakhovetski
2012-02-03 15:43 ` [PATCH/RFC] usb: fix renesas_usbhs to not schedule in atomic context Guennadi Liakhovetski
2012-02-05 14:54 ` Felipe Balbi
2012-02-06 10:11 ` Guennadi Liakhovetski
2012-02-06 10:31 ` Felipe Balbi
2012-02-06 8:52 ` Shimoda, Yoshihiro
2012-01-30 8:32 ` [PATCH 1/7 v2] dmaengine: add a simple dma library Vinod Koul
2012-01-30 9:34 ` Guennadi Liakhovetski
2012-01-31 6:41 ` Vinod Koul
2012-01-31 8:59 ` Guennadi Liakhovetski
2012-02-01 5:38 ` Vinod Koul
2012-02-03 16:38 ` Guennadi Liakhovetski
2012-02-06 2:54 ` Vinod Koul
2012-02-06 9:53 ` Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 2/7 v2] dma: shdma: prepare for simple DMA conversion Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 3/7 v2] mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare for simple DMA Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 4/7 v2] mmc: sh_mobile_sdhi: prepare for conversion to " Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 5/7 v2] serial: sh-sci: " Guennadi Liakhovetski
2012-01-26 14:56 ` Guennadi Liakhovetski [this message]
2012-02-06 2:33 ` [PATCH 6/7 v2] ASoC: SIU: " Vinod Koul
2012-02-06 9:11 ` Guennadi Liakhovetski
2012-01-26 14:56 ` [PATCH 7/7 v2] dma: shdma: convert to the simple DMA library Guennadi Liakhovetski
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=1327589784-4287-7-git-send-email-g.liakhovetski@gmx.de \
--to=g.liakhovetski@gmx.de \
--cc=alsa-devel@alsa-project.org \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=vinod.koul@intel.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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;
as well as URLs for NNTP newsgroup(s).