From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 27 Oct 2011 10:11:26 +0000 (+0200)
Subject: ASoC: Remove needless unlikely()
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~501
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b6247abc90a94a38c7e7314191871792645aa6a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: Remove needless unlikely()

There's no point in adding unlikely() annotations outside of hot paths
and on systems using these features the annotation will always be wrong
(as opposed to being something that only comes up once in a while) so
the annotation may even be harmful.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 52a7259f6184..49aa71e0d7e6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -319,8 +319,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 	cpu_dai->runtime = NULL;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		if (unlikely(codec->ignore_pmdown_time ||
-			rtd->dai_link->ignore_pmdown_time)) {
+		if (codec->ignore_pmdown_time ||
+		    rtd->dai_link->ignore_pmdown_time) {
 			/* powered down playback stream now */
 			snd_soc_dapm_stream_event(rtd,
 				codec_dai->driver->playback.stream_name,