ASoC: cs42l42: Simplify reporting of jack unplug

When reporting a jack unplug there's no need to make the reported
flags conditional on which flags were reported during the plug
event. It's perfectly safe to report all flags and buttons as
not-present and let the higher code filter for changes.

There's also no need to make two separate snd_soc_jack_report()
calls for presence flags and button flags. It can all be done in
one report.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211116163901.45390-4-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 3674f73..8efcee3 100644 (file)
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -1657,18 +1657,8 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)
                                cs42l42->plug_state = CS42L42_TS_UNPLUG;
                                cs42l42_cancel_hs_type_detect(cs42l42);
 
-                               switch (cs42l42->hs_type) {
-                               case CS42L42_PLUG_CTIA:
-                               case CS42L42_PLUG_OMTP:
-                                       snd_soc_jack_report(cs42l42->jack, 0, SND_JACK_HEADSET);
-                                       break;
-                               case CS42L42_PLUG_HEADPHONE:
-                                       snd_soc_jack_report(cs42l42->jack, 0, SND_JACK_HEADPHONE);
-                                       break;
-                               default:
-                                       break;
-                               }
                                snd_soc_jack_report(cs42l42->jack, 0,
+                                                   SND_JACK_HEADSET |
                                                    SND_JACK_BTN_0 | SND_JACK_BTN_1 |
                                                    SND_JACK_BTN_2 | SND_JACK_BTN_3);