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

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

ASoC: rsnd: remove non DT support for DMA 



Current Renesas Sound driver is based on DeviceTree, and no one is
using this driver from non DT. Non-DT support is no longer needed.
Let's remove it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent be78cea1

sound/soc/sh/rcar/dma.c

+6 −15
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int rsnd_dmaen_remove(struct rsnd_mod *mod, 
}



static int rsnd_dmaen_attach(struct rsnd_dai_stream *io,

			   struct rsnd_dma *dma, int id,

			   struct rsnd_dma *dma,

			   struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)

{

	struct rsnd_mod *mod = rsnd_mod_get(dma);
@@ -208,17 +208,8 @@ static int rsnd_dmaen_attach(struct rsnd_dai_stream *io, 
		return -EIO;

	}



	if (dev->of_node) {

	dmaen->chan = rsnd_dmaen_request_channel(io, mod_from, mod_to);

	} else {

		dma_cap_mask_t mask;



		dma_cap_zero(mask);

		dma_cap_set(DMA_SLAVE, mask);



		dmaen->chan = dma_request_channel(mask, shdma_chan_filter,

						  (void *)(uintptr_t)id);

	}

	if (IS_ERR_OR_NULL(dmaen->chan)) {

		dmaen->chan = NULL;

		dev_err(dev, "can't get dma channel\n");
@@ -394,7 +385,7 @@ static int rsnd_dmapp_start(struct rsnd_mod *mod, 
}



static int rsnd_dmapp_attach(struct rsnd_dai_stream *io,

			     struct rsnd_dma *dma, int id,

			     struct rsnd_dma *dma,

			     struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)

{

	struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
@@ -627,7 +618,7 @@ static void rsnd_dma_of_path(struct rsnd_mod *this, 
}



int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod,

		    struct rsnd_mod **dma_mod, int id)

		    struct rsnd_mod **dma_mod)

{

	struct rsnd_mod *mod_from = NULL;

	struct rsnd_mod *mod_to = NULL;
@@ -636,7 +627,7 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, 
	struct device *dev = rsnd_priv_to_dev(priv);

	struct rsnd_mod_ops *ops;

	enum rsnd_mod_type type;

	int (*attach)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id,

	int (*attach)(struct rsnd_dai_stream *io, struct rsnd_dma *dma,

		      struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);

	int is_play = rsnd_io_is_play(io);

	int ret, dma_id;
@@ -695,7 +686,7 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, 
			rsnd_mod_name(mod_from), rsnd_mod_id(mod_from),

			rsnd_mod_name(mod_to),   rsnd_mod_id(mod_to));



		ret = attach(io, dma, id, mod_from, mod_to);

		ret = attach(io, dma, mod_from, mod_to);

		if (ret < 0)

			return ret;

	}

sound/soc/sh/rcar/rsnd.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); 
 *	R-Car DMA

 */

int rsnd_dma_attach(struct rsnd_dai_stream *io,

		    struct rsnd_mod *mod, struct rsnd_mod **dma_mod, int id);

		    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,

sound/soc/sh/rcar/src.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int rsnd_src_probe_(struct rsnd_mod *mod, 
			return ret;

	}



	ret = rsnd_dma_attach(io, mod, &src->dma, 0);

	ret = rsnd_dma_attach(io, mod, &src->dma);



	return ret;

}

sound/soc/sh/rcar/ssi.c

+1 −2
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, 
			      struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	int dma_id = 0; /* not needed */

	int ret;



	/*
@@ -684,7 +683,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, 
		return ret;



	/* SSI probe might be called many times in MUX multi path */

	ret = rsnd_dma_attach(io, mod, &ssi->dma, dma_id);

	ret = rsnd_dma_attach(io, mod, &ssi->dma);



	return ret;

}