diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2021-03-12 12:22:29 -0600 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2021-03-18 13:50:39 +0000 |
| commit | 8d41c1ab248fa6e6bfd4728a31eec6d3b9e0f924 (patch) | |
| tree | 9a3cbcc91add1270de5520f8081793983f0f2b7b /sound/soc/codecs/cx2072x.c | |
| parent | ASoC: cx2070x: remove useless assignment (diff) | |
| download | wireguard-linux-8d41c1ab248fa6e6bfd4728a31eec6d3b9e0f924.tar.xz wireguard-linux-8d41c1ab248fa6e6bfd4728a31eec6d3b9e0f924.zip | |
ASoC: cx2070x: remove duplicate else branch
cppcheck warning:
sound/soc/codecs/cx2072x.c:1436:10: style:inconclusive: Found
duplicate branches for 'if' and 'else'. [duplicateBranch]
} else if (type & 0x4) {
^
sound/soc/codecs/cx2072x.c:1439:5: note: Found duplicate branches for
'if' and 'else'.
} else {
^
sound/soc/codecs/cx2072x.c:1436:10: note: Found duplicate branches for
'if' and 'else'.
} else if (type & 0x4) {
^
The last two branches do the same thing and can be collapsed together.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210312182246.5153-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/cx2072x.c')
| -rw-r--r-- | sound/soc/codecs/cx2072x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c index d2d004654c9b..d924e3528029 100644 --- a/sound/soc/codecs/cx2072x.c +++ b/sound/soc/codecs/cx2072x.c @@ -1430,11 +1430,11 @@ static int cx2072x_jack_status_check(void *data) state |= SND_JACK_HEADSET; if (type & 0x2) state |= SND_JACK_BTN_0; - } else if (type & 0x4) { - /* Nokia headset */ - state |= SND_JACK_HEADPHONE; } else { - /* Headphone */ + /* + * Nokia headset (type & 0x4) and + * regular Headphone + */ state |= SND_JACK_HEADPHONE; } } |