diff options
| author | Yangtao Li <tiny.windzz@gmail.com> | 2018-11-04 13:55:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-05 12:06:31 +0100 |
| commit | 0b6277e6343e192aaa7d452ab933281eb0d420dc (patch) | |
| tree | 8feecc8cdb358e421936350cc897e7c9f2425431 /sound/soc/codecs/nau8825.c | |
| parent | ASoC: Intel: mrfld: fix uninitialized variable access (diff) | |
| download | linux-0b6277e6343e192aaa7d452ab933281eb0d420dc.tar.xz linux-0b6277e6343e192aaa7d452ab933281eb0d420dc.zip | |
ASoC: nau8825: remove unnecessary unlikely()
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/nau8825.c')
| -rw-r--r-- | sound/soc/codecs/nau8825.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index b9fed99d8b5e..7bbcbf5f05c8 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -424,10 +424,8 @@ static u32 nau8825_xtalk_sidetone(u32 sig_org, u32 sig_cros) { u32 gain, sidetone; - if (unlikely(sig_org == 0) || unlikely(sig_cros == 0)) { - WARN_ON(1); + if (WARN_ON(sig_org == 0 || sig_cros == 0)) return 0; - } sig_org = nau8825_intlog10_dec3(sig_org); sig_cros = nau8825_intlog10_dec3(sig_cros); |