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

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

ASoC: rsnd: remove io from rsnd_mod 



Each Renesas sound mod (= SSI/SRC/DVC) might be called from many path
if it supports MIXer. In such case, mod <-> io is no longer 1:1
relationship. rsnd_mod_to_io() is no longer needed. Let's remove it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarKeita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d5bbe7de

sound/soc/sh/rcar/core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -288,7 +288,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod, 
	}

	}





	io->mod[mod->type] = mod;

	io->mod[mod->type] = mod;

	mod->io = io;





	return 0;

	return 0;

}

}
@@ -296,7 +295,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod, 
static void rsnd_dai_disconnect(struct rsnd_mod *mod,

static void rsnd_dai_disconnect(struct rsnd_mod *mod,

				struct rsnd_dai_stream *io)

				struct rsnd_dai_stream *io)

{

{

	mod->io = NULL;

	io->mod[mod->type] = NULL;

	io->mod[mod->type] = NULL;

}

}

sound/soc/sh/rcar/rsnd.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -262,7 +262,6 @@ struct rsnd_mod { 
	enum rsnd_mod_type type;

	enum rsnd_mod_type type;

	struct rsnd_mod_ops *ops;

	struct rsnd_mod_ops *ops;

	struct rsnd_dma dma;

	struct rsnd_dma dma;

	struct rsnd_dai_stream *io;

	struct rsnd_priv *priv;

	struct rsnd_priv *priv;

	struct clk *clk;

	struct clk *clk;

	u32 status;

	u32 status;
@@ -313,7 +312,6 @@ struct rsnd_mod { 




#define rsnd_mod_to_priv(mod) ((mod)->priv)

#define rsnd_mod_to_priv(mod) ((mod)->priv)

#define rsnd_mod_to_dma(mod) (&(mod)->dma)

#define rsnd_mod_to_dma(mod) (&(mod)->dma)

#define rsnd_mod_to_io(mod) ((mod)->io)

#define rsnd_mod_id(mod) ((mod)->id)

#define rsnd_mod_id(mod) ((mod)->id)

#define rsnd_mod_hw_start(mod)	clk_enable((mod)->clk)

#define rsnd_mod_hw_start(mod)	clk_enable((mod)->clk)

#define rsnd_mod_hw_stop(mod)	clk_disable((mod)->clk)

#define rsnd_mod_hw_stop(mod)	clk_disable((mod)->clk)