mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 01:41:39 +00:00
Code Issues Releases Wiki Activity

extcon: arizona: Tidy up transition from mic to headphone detect

Browse source 
Moving from microphone detection to headphone detection is done fairly
haphazardly at the moment, sometimes calling arizona_stop_mic at the
call site sometimes relying on a call inside arizona_identify_headphone.
Simplify all this and always call arizona_stop_mic at the top of
arizona_identify_headphone.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Charles Keepax 2019-12-09 11:09:11 +00:00 committed by Chanwoo Choi
parent ac7614fab9
commit d5aa46ddf9
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/extcon/extcon-arizona.c
View file

@ -705,8 +705,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
info->hpdet_active = true;
if (info->mic)
arizona_stop_mic(info);
arizona_stop_mic(info);
arizona_extcon_hp_clamp(info, true);
@ -815,8 +814,6 @@ static void arizona_micd_timeout_work(struct work_struct *work)
arizona_identify_headphone(info);
arizona_stop_mic(info);
mutex_unlock(&info->lock);
}
@ -906,7 +903,6 @@ static void arizona_micd_detect(struct work_struct *work)
if (!(val & ARIZONA_MICD_STS)) {
dev_warn(arizona->dev, "Detected open circuit\n");
info->mic = false;
arizona_stop_mic(info);
info->detecting = false;
arizona_identify_headphone(info);
goto handled;
@ -948,8 +944,6 @@ static void arizona_micd_detect(struct work_struct *work)
info->detecting = false;
arizona_identify_headphone(info);
arizona_stop_mic(info);
} else {
info->micd_mode++;
if (info->micd_mode == info->micd_num_modes)
@ -988,7 +982,6 @@ static void arizona_micd_detect(struct work_struct *work)
} else if (info->detecting) {
dev_dbg(arizona->dev, "Headphone detected\n");
info->detecting = false;
arizona_stop_mic(info);
arizona_identify_headphone(info);
} else {