Merge tag 'sound-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-block.git] / sound / soc / amd / vangogh / acp5x-pcm-dma.c

diff --git a/sound/soc/amd/vangogh/acp5x-pcm-dma.c b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
index d36bb718370f6fe24b7e00badfc14fbcaada924a..29901ee4bfe387e64ed2cdd773a3a8a18d22687b 100644 (file)
--- a/sound/soc/amd/vangogh/acp5x-pcm-dma.c
+++ b/sound/soc/amd/vangogh/acp5x-pcm-dma.c
@@ -415,10 +415,9 @@ static int acp5x_audio_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int acp5x_audio_remove(struct platform_device *pdev)
+static void acp5x_audio_remove(struct platform_device *pdev)
 {
        pm_runtime_disable(&pdev->dev);
-       return 0;
 }
 
 static int __maybe_unused acp5x_pcm_resume(struct device *dev)
@@ -500,7 +499,7 @@ static const struct dev_pm_ops acp5x_pm_ops = {
 
 static struct platform_driver acp5x_dma_driver = {
        .probe = acp5x_audio_probe,
-       .remove = acp5x_audio_remove,
+       .remove_new = acp5x_audio_remove,
        .driver = {
                .name = "acp5x_i2s_dma",
                .pm = &acp5x_pm_ops,