ASoC: Remove needless unlikely()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 27 Oct 2011 10:11:26 +0000 (12:11 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 4 Nov 2011 17:19:40 +0000 (17:19 +0000)
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>
sound/soc/soc-pcm.c

index 52a7259f61842d173a45ae57ff7fb9806cd73c94..49aa71e0d7e653d70e4102394f3ae6190bfcb22e 100644 (file)
@@ -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,