Commit 5e7b9edd authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: tidyup return value of rsnd_get_adinr_bit()



Renesas sound driver has rsnd_get_adinr_bit/chan() functions.
It is assuming _bit() returns ADINR :: OTBL,
and _chan() returns ADINR :: CHNUM.
Current _bit() returns both OTBL and CHNUM. This patch fixup it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cdf310ce
Loading
Loading
Loading
Loading
+5 −9
Original line number Original line Diff line number Diff line
@@ -227,21 +227,17 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
	struct device *dev = rsnd_priv_to_dev(priv);
	struct device *dev = rsnd_priv_to_dev(priv);
	u32 adinr = runtime->channels;


	switch (runtime->sample_bits) {
	switch (runtime->sample_bits) {
	case 16:
	case 16:
		adinr |= (8 << 16);
		return 8 << 16;
		break;
	case 32:
	case 32:
		adinr |= (0 << 16);
		return 0 << 16;
		break;
	default:
		dev_warn(dev, "not supported sample bits\n");
		return 0;
	}
	}


	return adinr;
	dev_warn(dev, "not supported sample bits\n");

	return 0;
}
}


u32 rsnd_get_adinr_chan(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
u32 rsnd_get_adinr_chan(struct rsnd_mod *mod, struct rsnd_dai_stream *io)