| From d3b13a06606ac181ba3a6dc353fa2ac0ee77c1e5 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 25 Oct 2016 00:36:56 +0000 |
| Subject: [PATCH 068/299] 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> |
| (cherry picked from commit dae4b83295ae50a86b5e3c60e7b6e2c597a1b69d) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/dma.c | 11 ----------- |
| sound/soc/sh/rcar/rsnd.h | 1 - |
| sound/soc/sh/rcar/ssi.c | 2 -- |
| 3 files changed, 14 deletions(-) |
| |
| --- 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_stre |
| 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); |
| --- 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 |
| */ |
| 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); |
| --- 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 rs |
| /* PIO will request IRQ again */ |
| free_irq(ssi->irq, mod); |
| |
| - rsnd_dma_detach(mod, &ssi->dma); |
| - |
| return 0; |
| } |
| |