mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
extcon: arizona: Remove unnecessary sets of ACCDET_MODE
arizona_start_mic sets ACCDET_MODE as required for the microphone detection as such it is redundant to set this outside of this function. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
parent
d5aa46ddf9
commit
f4ba6c0ba7
1 changed files with 0 additions and 11 deletions
|
@ -668,11 +668,6 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
|
|||
if (id_gpio)
|
||||
gpio_set_value_cansleep(id_gpio, 0);
|
||||
|
||||
/* Revert back to MICDET mode */
|
||||
regmap_update_bits(arizona->regmap,
|
||||
ARIZONA_ACCESSORY_DETECT_MODE_1,
|
||||
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
|
||||
|
||||
/* If we have a mic then reenable MICDET */
|
||||
if (mic || info->mic)
|
||||
arizona_start_mic(info);
|
||||
|
@ -732,9 +727,6 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
|
|||
arizona_extcon_hp_clamp(info, false);
|
||||
pm_runtime_put_autosuspend(info->dev);
|
||||
|
||||
regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
|
||||
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
|
||||
|
||||
/* Just report headphone */
|
||||
ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true);
|
||||
if (ret != 0)
|
||||
|
@ -789,9 +781,6 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)
|
|||
return;
|
||||
|
||||
err:
|
||||
regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
|
||||
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
|
||||
|
||||
/* Just report headphone */
|
||||
ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true);
|
||||
if (ret != 0)
|
||||
|
|
Loading…
Reference in a new issue