Merge tag 'asoc-v5.11' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / qcom / qdsp6 / q6adm.c

diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c
index 72f2972..1855b80 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6adm.c
+++ b/sound/soc/qcom/qdsp6/q6adm.c
@@ -601,14 +601,7 @@ static int q6adm_probe(struct apr_device *adev)
        INIT_LIST_HEAD(&adm->copps_list);
        spin_lock_init(&adm->copps_list_lock);
 
-       return of_platform_populate(dev->of_node, NULL, NULL, dev);
-}
-
-static int q6adm_remove(struct apr_device *adev)
-{
-       of_platform_depopulate(&adev->dev);
-
-       return 0;
+       return devm_of_platform_populate(dev);
 }
 
 #ifdef CONFIG_OF
@@ -621,7 +614,6 @@ MODULE_DEVICE_TABLE(of, q6adm_device_id);
 
 static struct apr_driver qcom_q6adm_driver = {
        .probe = q6adm_probe,
-       .remove = q6adm_remove,
        .callback = q6adm_callback,
        .driver = {
                .name = "qcom-q6adm",