| Message ID | 1341484183-10757-3-git-send-email-g.liakhovetski@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9d051dc79f8fd1854229178476db0534359a3704 |
| Headers | show |
On Thu, Jul 05, 2012 at 12:29:38PM +0200, Guennadi Liakhovetski wrote: > DMA channels are filtered based on slave IDs, no need to additionally filter > on DMA device. This doesn't apply, please regenerate against current code.
On Thu, 5 Jul 2012, Mark Brown wrote: > On Thu, Jul 05, 2012 at 12:29:38PM +0200, Guennadi Liakhovetski wrote: > > DMA channels are filtered based on slave IDs, no need to additionally filter > > on DMA device. > > This doesn't apply, please regenerate against current code. Sure, as I mentioned in my description mail: "This patch series goes on top of my earlier patches to split shdma.c." And that patch series, also available at git://github.com/lyakh/linux.git shdma-base contains this patch: commit 553d9459a90e9cc6997da2c34bb637794d6a4ac5 ASoC: siu: prepare for conversion to the shdma base library Sorry, I should have mentioned, that various DMA slave drivers also have dependencies in that series. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 05, 2012 at 03:54:30PM +0200, Guennadi Liakhovetski wrote: > On Thu, 5 Jul 2012, Mark Brown wrote: > > This doesn't apply, please regenerate against current code. > Sure, as I mentioned in my description mail: "This patch series goes on > top of my earlier patches to split shdma.c." And that patch series, also > available at Ah, right. You didn't send me your cover mail, you only CCed me on the individual patch, so I hadn't seen this.
On Thu, 5 Jul 2012, Mark Brown wrote: > On Thu, Jul 05, 2012 at 03:54:30PM +0200, Guennadi Liakhovetski wrote: > > On Thu, 5 Jul 2012, Mark Brown wrote: > > > > This doesn't apply, please regenerate against current code. > > > Sure, as I mentioned in my description mail: "This patch series goes on > > top of my earlier patches to split shdma.c." And that patch series, also > > available at > > Ah, right. You didn't send me your cover mail, you only CCed me on the > individual patch, so I hadn't seen this. Indeed, sorry again. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 3fdc801..488f9be 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -332,9 +332,6 @@ static bool filter(struct dma_chan *chan, void *slave) pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id); - if (unlikely(param->dma_dev != chan->device->dev)) - return false; - chan->private = ¶m->shdma_slave; return true; } @@ -369,7 +366,6 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) pdata->dma_slave_rx_a; } - param->dma_dev = pdata->dma_dev; /* Get DMA channel */ siu_stream->chan = dma_request_channel(mask, filter, param); if (!siu_stream->chan) {
DMA channels are filtered based on slave IDs, no need to additionally filter on DMA device. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> --- sound/soc/sh/siu_pcm.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)