|
@@ -483,16 +483,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
|
|
goto err_suspend;
|
|
goto err_suspend;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
|
|
|
|
|
|
+ ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "Could not register PCM\n");
|
|
dev_err(&pdev->dev, "Could not register PCM\n");
|
|
- goto err_pcm_register;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
-err_pcm_register:
|
|
|
|
- snd_dmaengine_pcm_unregister(&pdev->dev);
|
|
|
|
err_suspend:
|
|
err_suspend:
|
|
if (!pm_runtime_status_suspended(&pdev->dev))
|
|
if (!pm_runtime_status_suspended(&pdev->dev))
|
|
i2s_runtime_suspend(&pdev->dev);
|
|
i2s_runtime_suspend(&pdev->dev);
|
|
@@ -512,8 +510,6 @@ static int rockchip_i2s_remove(struct platform_device *pdev)
|
|
|
|
|
|
clk_disable_unprepare(i2s->mclk);
|
|
clk_disable_unprepare(i2s->mclk);
|
|
clk_disable_unprepare(i2s->hclk);
|
|
clk_disable_unprepare(i2s->hclk);
|
|
- snd_dmaengine_pcm_unregister(&pdev->dev);
|
|
|
|
- snd_soc_unregister_component(&pdev->dev);
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|