anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ASoC: mediatek: mt8195-afe-pcm: Convert to platform remove callback returning void"

Browse Source 
This reverts commit cc4a2c0b1e which is
commit 6461fee68064ba970e3ba90241fe5f5e038aa9d4 upstream.

It breaks the build as the remove_new callback was not introduced in
this branch, so revert it and keep the real bugfix that this change was
applied to allow to apply easier.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iec7b930bcba2b48d444deb7df2496f4e039bfef7
This commit is contained in:
Greg Kroah-Hartman
2023-06-27 08:58:05 +00:00
parent 93e0420e2f
commit 37229af35b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
View File

@@ -3237,13 +3237,15 @@ err_pm_put:
return ret;
}
static void mt8195_afe_pcm_dev_remove(struct platform_device *pdev)
static int mt8195_afe_pcm_dev_remove(struct platform_device *pdev)
{
snd_soc_unregister_component(&pdev->dev);
pm_runtime_disable(&pdev->dev);
if (!pm_runtime_status_suspended(&pdev->dev))
mt8195_afe_runtime_suspend(&pdev->dev);
return 0;
}
static const struct of_device_id mt8195_afe_pcm_dt_match[] = {
@@ -3266,7 +3268,7 @@ static struct platform_driver mt8195_afe_pcm_driver = {
#endif
},
.probe = mt8195_afe_pcm_dev_probe,
.remove_new = mt8195_afe_pcm_dev_remove,
.remove = mt8195_afe_pcm_dev_remove,
};
module_platform_driver(mt8195_afe_pcm_driver);