| From 56c93fb6527be379fa747678bca4936353ad5adc Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 15 Jul 2015 07:15:27 +0000 |
| Subject: [PATCH 299/326] ASoC: rsnd: tidyup rsnd_dma_ops definition place |
| |
| rsnd_dma_ops is used only from dma.c, rsnd.h doesn't need it. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit 98d358af07aa6fc4cd6cdfd3256ab792eb3675cd) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/dma.c | 8 ++++++++ |
| sound/soc/sh/rcar/rsnd.h | 7 ------- |
| 2 files changed, 8 insertions(+), 7 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c |
| index d306e298c63d..943106136d99 100644 |
| --- a/sound/soc/sh/rcar/dma.c |
| +++ b/sound/soc/sh/rcar/dma.c |
| @@ -27,6 +27,14 @@ struct rsnd_dma_ctrl { |
| int dmapp_num; |
| }; |
| |
| +struct rsnd_dma_ops { |
| + void (*start)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| + void (*stop)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| + int (*init)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id, |
| + struct rsnd_mod *mod_from, struct rsnd_mod *mod_to); |
| + void (*quit)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| +}; |
| + |
| #define rsnd_priv_to_dmac(p) ((struct rsnd_dma_ctrl *)(p)->dma) |
| |
| /* |
| diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h |
| index 6c10a8b9210e..705e66f66ab8 100644 |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -181,13 +181,6 @@ void rsnd_path_parse(struct rsnd_priv *priv, |
| * R-Car DMA |
| */ |
| struct rsnd_dma; |
| -struct rsnd_dma_ops { |
| - void (*start)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| - void (*stop)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| - int (*init)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id, |
| - struct rsnd_mod *mod_from, struct rsnd_mod *mod_to); |
| - void (*quit)(struct rsnd_dai_stream *io, struct rsnd_dma *dma); |
| -}; |
| |
| struct rsnd_dmaen { |
| struct dma_chan *chan; |
| -- |
| 2.6.2 |
| |
