From a7d094297946e32da9bdf03cd5be1f6954d17ed3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 4 Aug 2013 20:22:03 +0100 Subject: 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 Signed-off-by: Mark Brown --- sound/soc/kirkwood/kirkwood.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sound/soc/kirkwood/kirkwood.h') 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; }; -- cgit v1.2.3-55-g7522