projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1539c7f
)
ASoC: nau8825: remove unnecessary unlikely()
author
Yangtao Li
<tiny.windzz@gmail.com>
Sun, 4 Nov 2018 12:55:29 +0000
(07:55 -0500)
committer
Mark Brown
<broonie@kernel.org>
Mon, 5 Nov 2018 11:06:31 +0000
(11:06 +0000)
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>
sound/soc/codecs/nau8825.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/nau8825.c
b/sound/soc/codecs/nau8825.c
index b9fed99d8b5ed389d15d41af269f79d3f6ae0ce3..7bbcbf5f05c88760957e85b3bce64c04f60a01c0 100644
(file)
--- 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);