Skip to content

Commit

Permalink
ASoC: Remove needless unlikely()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Nov 4, 2011
1 parent 98dd932 commit 5b6247a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 5b6247a

Please sign in to comment.