ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 4 Aug 2013 19:22:03 +0000 (20:22 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 5 Aug 2013 14:49:20 +0000 (15:49 +0100)
commita7d094297946e32da9bdf03cd5be1f6954d17ed3
tree060448de363378786afd6277bf836071ea53e4e6
parent8a537f85e9db8a43b323b0ffcf358c51448491de
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>
sound/soc/kirkwood/kirkwood-dma.c
sound/soc/kirkwood/kirkwood.h