diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-10-25 00:36:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-25 15:02:43 +0100 |
| commit | dae4b83295ae50a86b5e3c60e7b6e2c597a1b69d (patch) | |
| tree | e9a14aa03fca391f25f9f31b0121d55c94cdc874 /sound/soc/sh/rcar | |
| parent | 701172dca15ba9860ba73d3e18082fbd2a78f2c9 (diff) | |
ASoC: rsnd: remove rsnd_dma_detach()
DMA mod is now connected to stream via rsnd_dai_connect().
This means DMA mod can use .remove for its clearance.
rsnd_dma_detach() is no longer needed.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar')
| -rw-r--r-- | sound/soc/sh/rcar/dma.c | 11 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 1 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index e0761cac0ab7..c85a55111392 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -698,17 +698,6 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return 0; } -void rsnd_dma_detach(struct rsnd_mod *mod, struct rsnd_mod **dma_mod) -{ - if (*dma_mod) { - struct rsnd_priv *priv = rsnd_mod_to_priv(mod); - struct device *dev = rsnd_priv_to_dev(priv); - - devm_kfree(dev, *dma_mod); - *dma_mod = NULL; - } -} - int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 2460d1fbf775..c1cee1ab3e62 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -200,7 +200,6 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); -void rsnd_dma_detach(struct rsnd_mod *mod, struct rsnd_mod **dma_mod); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index b0338d0a4cde..e23e07b54d8c 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -701,8 +701,6 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, /* PIO will request IRQ again */ free_irq(ssi->irq, mod); - rsnd_dma_detach(mod, &ssi->dma); - return 0; } |