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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 849c1ad93df2d21095e926caa6101dfb6444b727..44f32c1db05d9c5315b244b0c6f739ecb72d1cc2 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -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 snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
        struct device *dev = rsnd_priv_to_dev(priv);
-       u32 adinr = runtime->channels;
 
        switch (runtime->sample_bits) {
        case 16:
-               adinr |= (8 << 16);
-               break;
+               return 8 << 16;
        case 32:
-               adinr |= (0 << 16);
-               break;
-       default:
-               dev_warn(dev, "not supported sample bits\n");
-               return 0;
+               return 0 << 16;
        }
 
-       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)