Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 401cf146 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: arizona: call wm_adsp2_remove when codec driver is removed 



Ensure that the wm_adsp driver cleans up when the codec driver
is removed.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 66225e98

sound/soc/codecs/cs47l24.c

+5 −0
Original line number Diff line number Diff line
@@ -1238,10 +1238,15 @@ static int cs47l24_probe(struct platform_device *pdev) 


static int cs47l24_remove(struct platform_device *pdev)

{

	struct cs47l24_priv *cs47l24 = platform_get_drvdata(pdev);



	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_codec(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	wm_adsp2_remove(&cs47l24->core.adsp[1]);

	wm_adsp2_remove(&cs47l24->core.adsp[2]);



	return 0;

}

sound/soc/codecs/wm5102.c

+4 −0
Original line number Diff line number Diff line
@@ -2093,10 +2093,14 @@ static int wm5102_probe(struct platform_device *pdev) 


static int wm5102_remove(struct platform_device *pdev)

{

	struct wm5102_priv *wm5102 = platform_get_drvdata(pdev);



	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_codec(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	wm_adsp2_remove(&wm5102->core.adsp[0]);



	return 0;

}

sound/soc/codecs/wm5110.c

+6 −0
Original line number Diff line number Diff line
@@ -2435,10 +2435,16 @@ static int wm5110_probe(struct platform_device *pdev) 


static int wm5110_remove(struct platform_device *pdev)

{

	struct wm5110_priv *wm5110 = platform_get_drvdata(pdev);

	int i;



	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_codec(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	for (i = 0; i < WM5110_NUM_ADSP; i++)

		wm_adsp2_remove(&wm5110->core.adsp[i]);



	return 0;

}