ASoC: rsnd: remove un-needed parameter from rsnd_dma_init() (4715219e) · Commits · 戴 / test

sound/soc/sh/rcar/core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -311,13 +311,15 @@ static void rsnd_dma_of_path(struct rsnd_dma *dma,
		}
		}

		int rsnd_dma_init(struct rsnd_priv priv, struct rsnd_dma dma,
		int is_play, int id)
		int rsnd_dma_init(struct rsnd_priv priv, struct rsnd_dma dma, int id)
		{
		struct device *dev = rsnd_priv_to_dev(priv);
		struct dma_slave_config cfg;
		struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
		struct rsnd_mod *mod_from;
		struct rsnd_mod *mod_to;
		struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
		int is_play = rsnd_io_is_play(io);
		char dma_name[DMA_NAME_SIZE];
		dma_cap_mask_t mask;
		int ret;

+1 −15

Original line number	Diff line number	Diff line
		@@ -179,8 +179,7 @@ struct rsnd_dma {
		void rsnd_dma_start(struct rsnd_dma *dma);
		void rsnd_dma_stop(struct rsnd_dma *dma);
		int rsnd_dma_available(struct rsnd_dma *dma);
		int rsnd_dma_init(struct rsnd_priv priv, struct rsnd_dma dma,
		int is_play, int id);
		int rsnd_dma_init(struct rsnd_priv priv, struct rsnd_dma dma, int id);
		void rsnd_dma_quit(struct rsnd_priv *priv,
		struct rsnd_dma *dma);

		@@ -413,19 +412,6 @@ struct rsnd_priv {
		#define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags)
		#define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags)

		#define rsnd_info_is_playback(priv, type) \
		({ \
		struct rcar_snd_info *info = rsnd_priv_to_info(priv); \
		int i, is_play = 0; \
		for (i = 0; i < info->dai_info_nr; i++) { \
		if (info->dai_info[i].playback.type == (type)->info) { \
		is_play = 1; \
		break; \
		} \
		} \
		is_play; \
		})

		/*
		* rsnd_kctrl
		*/

+0 −1

Original line number	Diff line number	Diff line
		@@ -713,7 +713,6 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,

		ret = rsnd_dma_init(priv,
		rsnd_mod_to_dma(mod),
		rsnd_info_is_playback(priv, src),
		src->info->dma_id);
		if (ret)
		goto rsnd_src_probe_gen2_fail;

+0 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,

		ret = rsnd_dma_init(
		priv, rsnd_mod_to_dma(mod),
		rsnd_info_is_playback(priv, ssi),
		dma_id);
		if (ret)
		goto rsnd_ssi_dma_probe_fail;