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

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

ASoC: rsnd: remove rsnd_src_non_ops 



Renesas sound driver is supporting Gen1/Gen2.
SRC probe can return error if it was unknown
generation.
Now, rsnd_src_non_ops is not needed.

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

sound/soc/sh/rcar/src.c

+10 −10
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ static int rsnd_src_stop(struct rsnd_mod *mod, 
	return 0;

}



static struct rsnd_mod_ops rsnd_src_non_ops = {

	.name	= "src (non)",

};



/*

 *		Gen1 functions

 */
@@ -627,6 +623,16 @@ int rsnd_src_probe(struct platform_device *pdev, 
	char name[RSND_SRC_NAME_SIZE];

	int i, nr;



	ops = NULL;

	if (rsnd_is_gen1(priv))

		ops = &rsnd_src_gen1_ops;

	if (rsnd_is_gen2(priv))

		ops = &rsnd_src_gen2_ops;

	if (!ops) {

		dev_err(dev, "unknown Generation\n");

		return -EIO;

	}



	rsnd_of_parse_src(pdev, of_data, priv);



	/*
@@ -655,12 +661,6 @@ int rsnd_src_probe(struct platform_device *pdev, 
		src->info = &info->src_info[i];

		src->clk = clk;



		ops = &rsnd_src_non_ops;

		if (rsnd_is_gen1(priv))

			ops = &rsnd_src_gen1_ops;

		if (rsnd_is_gen2(priv))

			ops = &rsnd_src_gen2_ops;



		rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);



		dev_dbg(dev, "SRC%d probed\n", i);