Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dae4b832 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 701172dc

sound/soc/sh/rcar/dma.c

+0 −11
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/rsnd.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/ssi.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}