aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-07-12 23:12:53 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-13 07:35:35 -0400
commita09370cb8c8144744cef4d8cc993472f6f8edcb7 (patch)
treeb78fd6130aa6bbaa9de50690ca7876eeff58a2ee /sound/soc/sh
parent095687c48b2e3b9f849554ab7a65e74988d50269 (diff)
ASoC: fsi: remove un-used variable on fsi_dai_startup
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/fsi.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index b1cd859723c0..55a03db6daaf 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -653,7 +653,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
653 struct snd_soc_dai *dai) 653 struct snd_soc_dai *dai)
654{ 654{
655 struct fsi_priv *fsi = fsi_get_priv(substream); 655 struct fsi_priv *fsi = fsi_get_priv(substream);
656 const char *msg;
657 u32 flags = fsi_get_info_flags(fsi); 656 u32 flags = fsi_get_info_flags(fsi);
658 u32 fmt; 657 u32 fmt;
659 u32 reg; 658 u32 reg;
@@ -691,33 +690,27 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
691 fmt = is_play ? SH_FSI_GET_OFMT(flags) : SH_FSI_GET_IFMT(flags); 690 fmt = is_play ? SH_FSI_GET_OFMT(flags) : SH_FSI_GET_IFMT(flags);
692 switch (fmt) { 691 switch (fmt) {
693 case SH_FSI_FMT_MONO: 692 case SH_FSI_FMT_MONO:
694 msg = "MONO";
695 data = CR_FMT(CR_MONO); 693 data = CR_FMT(CR_MONO);
696 fsi->chan = 1; 694 fsi->chan = 1;
697 break; 695 break;
698 case SH_FSI_FMT_MONO_DELAY: 696 case SH_FSI_FMT_MONO_DELAY:
699 msg = "MONO Delay";
700 data = CR_FMT(CR_MONO_D); 697 data = CR_FMT(CR_MONO_D);
701 fsi->chan = 1; 698 fsi->chan = 1;
702 break; 699 break;
703 case SH_FSI_FMT_PCM: 700 case SH_FSI_FMT_PCM:
704 msg = "PCM";
705 data = CR_FMT(CR_PCM); 701 data = CR_FMT(CR_PCM);
706 fsi->chan = 2; 702 fsi->chan = 2;
707 break; 703 break;
708 case SH_FSI_FMT_I2S: 704 case SH_FSI_FMT_I2S:
709 msg = "I2S";
710 data = CR_FMT(CR_I2S); 705 data = CR_FMT(CR_I2S);
711 fsi->chan = 2; 706 fsi->chan = 2;
712 break; 707 break;
713 case SH_FSI_FMT_TDM: 708 case SH_FSI_FMT_TDM:
714 msg = "TDM";
715 fsi->chan = is_play ? 709 fsi->chan = is_play ?
716 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 710 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
717 data = CR_FMT(CR_TDM) | (fsi->chan - 1); 711 data = CR_FMT(CR_TDM) | (fsi->chan - 1);
718 break; 712 break;
719 case SH_FSI_FMT_TDM_DELAY: 713 case SH_FSI_FMT_TDM_DELAY:
720 msg = "TDM Delay";
721 fsi->chan = is_play ? 714 fsi->chan = is_play ?
722 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 715 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
723 data = CR_FMT(CR_TDM_D) | (fsi->chan - 1); 716 data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);