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

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

ASoC: rcar: remove .path_init/exit from rsnd_gen_ops 



rsnd_gen_ops has .path_init/exit callback function
which cares SRU/SSI (if Gen1) SCU/SSIU/SSI (if Gen2)
path settings.
But, the differences between Gen1/Gen2 are cared
in ssi.c/scu.c, and the path itself is same in Gen1/Gen2.
This patch removes .path_init/exit callback.

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

sound/soc/sh/rcar/gen.c

+15 −39
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ struct rsnd_gen_ops { 
		     struct rsnd_priv *priv);

	void (*remove)(struct platform_device *pdev,

		      struct rsnd_priv *priv);

	int (*path_init)(struct rsnd_priv *priv,

			 struct rsnd_dai *rdai,

			 struct rsnd_dai_stream *io);

	int (*path_exit)(struct rsnd_priv *priv,

			 struct rsnd_dai *rdai,

			 struct rsnd_dai_stream *io);

};



struct rsnd_gen {
@@ -168,15 +162,8 @@ static int rsnd_gen_regmap_init(struct rsnd_priv *priv, 


	return 0;

}

/*

 *		Gen2

 *		will be filled in the future

 */



/*

 *		Gen1

 */

static int rsnd_gen1_path_init(struct rsnd_priv *priv,

int rsnd_gen_path_init(struct rsnd_priv *priv,

		       struct rsnd_dai *rdai,

		       struct rsnd_dai_stream *io)

{
@@ -216,7 +203,7 @@ static int rsnd_gen1_path_init(struct rsnd_priv *priv, 
	return ret;

}



static int rsnd_gen1_path_exit(struct rsnd_priv *priv,

int rsnd_gen_path_exit(struct rsnd_priv *priv,

		       struct rsnd_dai *rdai,

		       struct rsnd_dai_stream *io)

{
@@ -232,6 +219,15 @@ static int rsnd_gen1_path_exit(struct rsnd_priv *priv, 
	return ret;

}



/*

 *		Gen2

 *		will be filled in the future

 */



/*

 *		Gen1

 */



/* single address mapping */

#define RSND_GEN1_S_REG(gen, reg, id, offset)	\

	RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, 0, 9)
@@ -319,31 +315,11 @@ static void rsnd_gen1_remove(struct platform_device *pdev, 
static struct rsnd_gen_ops rsnd_gen1_ops = {

	.probe		= rsnd_gen1_probe,

	.remove		= rsnd_gen1_remove,

	.path_init	= rsnd_gen1_path_init,

	.path_exit	= rsnd_gen1_path_exit,

};



/*

 *		Gen

 */

int rsnd_gen_path_init(struct rsnd_priv *priv,

		       struct rsnd_dai *rdai,

		       struct rsnd_dai_stream *io)

{

	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);



	return gen->ops->path_init(priv, rdai, io);

}



int rsnd_gen_path_exit(struct rsnd_priv *priv,

		       struct rsnd_dai *rdai,

		       struct rsnd_dai_stream *io)

{

	struct rsnd_gen *gen = rsnd_priv_to_gen(priv);



	return gen->ops->path_exit(priv, rdai, io);

}



int rsnd_gen_probe(struct platform_device *pdev,

		   struct rcar_snd_info *info,

		   struct rsnd_priv *priv)