Unverified Commit 039f2ccc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: tidyup rsnd_dma_request_channel() 



This patch adds "char *name" to rsnd_dma_request_channel().
It is not yet used so far, but is preparation for
next "ASoC: rsnd: adjust disabled module" patch

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878s3vk01q.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ec02b5a1

sound/soc/sh/rcar/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod, 
	return 0;

}



struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,

					  struct rsnd_mod *mod, char *name)

struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, char *name,

					  struct rsnd_mod *mod, char *x)

{

	struct dma_chan *chan = NULL;

	struct device_node *np;
@@ -246,7 +246,7 @@ struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, 


	for_each_child_of_node(of_node, np) {

		if (i == rsnd_mod_id_raw(mod) && (!chan))

			chan = of_dma_request_slave_channel(np, name);

			chan = of_dma_request_slave_channel(np, x);

		i++;

	}

sound/soc/sh/rcar/dvc.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_dai_stream *io, 
	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);



	return rsnd_dma_request_channel(rsnd_dvc_of_node(priv),

					mod, "tx");

					DVC_NAME, mod, "tx");

}



#ifdef CONFIG_DEBUG_FS

sound/soc/sh/rcar/rsnd.h

+2 −2
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); 
int rsnd_dma_attach(struct rsnd_dai_stream *io,

		    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);

struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, char *name,

					  struct rsnd_mod *mod, char *x);



/*

 *	R-Car sound mod

sound/soc/sh/rcar/src.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct dma_chan *rsnd_src_dma_req(struct rsnd_dai_stream *io, 
	int is_play = rsnd_io_is_play(io);



	return rsnd_dma_request_channel(rsnd_src_of_node(priv),

					mod,

					SRC_NAME, mod,

					is_play ? "rx" : "tx");

}

sound/soc/sh/rcar/ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io, 
		name = is_play ? "rx" : "tx";



	return rsnd_dma_request_channel(rsnd_ssi_of_node(priv),

					mod, name);

					SSI_NAME, mod, name);

}



#ifdef CONFIG_DEBUG_FS