diff options
| author | Russell King | 2013-08-04 21:22:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-08-05 16:49:20 +0200 |
| commit | a7d094297946e32da9bdf03cd5be1f6954d17ed3 (patch) | |
| tree | 060448de363378786afd6277bf836071ea53e4e6 /sound/soc/kirkwood/kirkwood.h | |
| parent | ASoC: kirkwood-i2s: fix a compilation warning (diff) | |
| download | kernel-qcow2-linux-a7d094297946e32da9bdf03cd5be1f6954d17ed3.tar.gz kernel-qcow2-linux-a7d094297946e32da9bdf03cd5be1f6954d17ed3.tar.xz kernel-qcow2-linux-a7d094297946e32da9bdf03cd5be1f6954d17ed3.zip | |
ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data
Merge these two structures together; nothing other than the I2S and
DMA driver makes use of struct kirkwood_dma_data, and it's not like
struct kirkwood_dma_data is really just used to convey DMA specific
data to the backend; it's more a general shared structure between the
two halves.
This will later allow kirkwood-dma.c and kirkwood-i2s.c to be merged
together.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/kirkwood/kirkwood.h')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/kirkwood/kirkwood.h b/sound/soc/kirkwood/kirkwood.h index 4d92637ddb3f..10a3aaafe0aa 100644 --- a/sound/soc/kirkwood/kirkwood.h +++ b/sound/soc/kirkwood/kirkwood.h @@ -129,6 +129,8 @@ struct kirkwood_dma_data { struct clk *extclk; uint32_t ctl_play; uint32_t ctl_rec; + struct snd_pcm_substream *substream_play; + struct snd_pcm_substream *substream_rec; int irq; int burst; }; |