diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-10-11 22:40:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-12 06:02:54 -0400 |
commit | 75eda968e4db79bda95e9a5f90aead952c273839 (patch) | |
tree | 1b65ed170837dcaace36dbe49a1735bc0db4f093 /sound/soc/sh | |
parent | a68a3b4ed4ecafcf80f4272e8e1f0670b387041e (diff) |
ASoC: fsi: avoid un-necessary status read
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index d68dcbb8dc1f..2b3a50d48ce5 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -572,7 +572,6 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play) | |||
572 | { | 572 | { |
573 | struct snd_pcm_runtime *runtime; | 573 | struct snd_pcm_runtime *runtime; |
574 | struct snd_pcm_substream *substream = NULL; | 574 | struct snd_pcm_substream *substream = NULL; |
575 | u32 status; | ||
576 | u32 status_reg = is_play ? DOFF_ST : DIFF_ST; | 575 | u32 status_reg = is_play ? DOFF_ST : DIFF_ST; |
577 | int data_residue_num; | 576 | int data_residue_num; |
578 | int data_num; | 577 | int data_num; |
@@ -662,9 +661,9 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play) | |||
662 | fsi->buff_offset += fsi_num2offset(data_num, ch_width); | 661 | fsi->buff_offset += fsi_num2offset(data_num, ch_width); |
663 | 662 | ||
664 | /* check fifo status */ | 663 | /* check fifo status */ |
665 | status = fsi_reg_read(fsi, status_reg); | ||
666 | if (!startup) { | 664 | if (!startup) { |
667 | struct snd_soc_dai *dai = fsi_get_dai(substream); | 665 | struct snd_soc_dai *dai = fsi_get_dai(substream); |
666 | u32 status = fsi_reg_read(fsi, status_reg); | ||
668 | 667 | ||
669 | if (status & ERR_OVER) | 668 | if (status & ERR_OVER) |
670 | dev_err(dai->dev, "over run\n"); | 669 | dev_err(dai->dev, "over run\n"); |