UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rsnd: remove rsnd_get_slot_runtime() 

Current Renesas sound driver is using rsnd_get_slot_runtime(), but
it is same as runtime->channels. This patch removes
rsnd_get_slot_runtime()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2015-12-17 02:57:07 +00:00 committed by Mark Brown
parent 49ee73b441
commit 5858a7d17e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/sh/rcar/core.c
View File

@ -196,21 +196,10 @@ int rsnd_get_slot_rdai(struct rsnd_dai *rdai)
return rdai->slots; return rdai->slots;
} }
int rsnd_get_slot_runtime(struct rsnd_dai_stream *io)
{
struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
int chan = rsnd_get_slot_rdai(rdai);
if (runtime->channels < chan)
chan = runtime->channels;
return chan;
}
int rsnd_get_slot_extend(struct rsnd_dai_stream *io) int rsnd_get_slot_extend(struct rsnd_dai_stream *io)
{ {
int chan = rsnd_get_slot_runtime(io); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
int chan = runtime->channels;
/* TDM Extend Mode needs 8ch */ /* TDM Extend Mode needs 8ch */
if (chan == 6) if (chan == 6)
@ -243,9 +232,9 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
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)
{ {
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 device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_dai *rdai = rsnd_io_to_rdai(io); u32 chan = runtime->channels;
u32 chan = rsnd_get_slot_rdai(rdai);
switch (chan) { switch (chan) {
case 1: case 1:

1
sound/soc/sh/rcar/rsnd.h
View File

@ -294,7 +294,6 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
struct rsnd_dai_stream *io)); struct rsnd_dai_stream *io));
int rsnd_get_slot_rdai(struct rsnd_dai *rdai); int rsnd_get_slot_rdai(struct rsnd_dai *rdai);
int rsnd_get_slot_runtime(struct rsnd_dai_stream *io);
int rsnd_get_slot_extend(struct rsnd_dai_stream *io); int rsnd_get_slot_extend(struct rsnd_dai_stream *io);
/* /*