Skip to content

Commit 04c319e

Browse files
MaslankaMarekbroonie
authored andcommitted
ASoC: Intel: avs: da7219: Remove suspend_pre() and resume_post()
The presence of a plugged jack is not detected after resuming the device if the jack was plugged before the device was suspended. This problem is caused by calling the sound/soc/codecs/da7219-aad.c:da7219_aad_jack_det() function on resume, which forces the jack insertion state to be unplugged. Signed-off-by: Marek Maslanka <[email protected]> Link: https://patch.msgid.link/[email protected] Reviewed-by: Cezary Rojewski <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 40384c8 commit 04c319e

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

sound/soc/intel/avs/boards/da7219.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -209,21 +209,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
209209
return 0;
210210
}
211211

212-
static int avs_card_suspend_pre(struct snd_soc_card *card)
213-
{
214-
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, DA7219_DAI_NAME);
215-
216-
return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
217-
}
218-
219-
static int avs_card_resume_post(struct snd_soc_card *card)
220-
{
221-
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, DA7219_DAI_NAME);
222-
struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
223-
224-
return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
225-
}
226-
227212
static int avs_da7219_probe(struct platform_device *pdev)
228213
{
229214
struct snd_soc_dai_link *dai_link;
@@ -255,8 +240,6 @@ static int avs_da7219_probe(struct platform_device *pdev)
255240
card->name = "avs_da7219";
256241
card->dev = dev;
257242
card->owner = THIS_MODULE;
258-
card->suspend_pre = avs_card_suspend_pre;
259-
card->resume_post = avs_card_resume_post;
260243
card->dai_link = dai_link;
261244
card->num_links = 1;
262245
card->controls = card_controls;

0 commit comments

Comments
 (0)