asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: rsnd: remove rsnd_dma::dir

Browse source 
DMAEngine direction can be calculated from rsnd_dai_stream,
So, rsnd_dma::dir does not make sense now.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2015-02-20 10:28:32 +00:00 committed by Mark Brown
parent 56f2906ae2
commit aaf4fce019
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/soc/sh/rcar/dma.c
View file

@ -87,12 +87,13 @@ static void rsnd_dmaen_start(struct rsnd_dma *dma)
struct snd_pcm_substream *substream = io->substream;
struct device *dev = rsnd_priv_to_dev(priv);
struct dma_async_tx_descriptor *desc;
int is_play = rsnd_io_is_play(io);
desc = dmaengine_prep_dma_cyclic(dma->chan,
substream->runtime->dma_addr,
snd_pcm_lib_buffer_bytes(substream),
snd_pcm_lib_period_bytes(substream),
dma->dir,
is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) {
@ -156,8 +157,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
if (ret < 0)
goto rsnd_dma_init_err;
dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
return 0;
rsnd_dma_init_err:

1
sound/soc/sh/rcar/rsnd.h
View file

@ -182,7 +182,6 @@ struct rsnd_dma_ops {
struct rsnd_dma {
struct dma_chan *chan;
struct rsnd_dma_ops *ops;
enum dma_transfer_direction dir;
int dmapp_id;
u32 chcr;
dma_addr_t src_addr;