ASoC: qdsp6: q6afe: use of_platform_populate/depopulate()

Now that the child nodes have there own compatible strings,
Use of_platform_populate/depopulate() instead of less common
of_platform_device_create()/destroy().

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 01f4321..621b67b 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -316,7 +316,6 @@ struct q6afe {
        struct mutex lock;
        struct list_head port_list;
        spinlock_t port_list_lock;
-       struct platform_device *pdev_dais;
 };
 
 struct afe_port_cmd_device_start {
@@ -1438,7 +1437,6 @@ static int q6afe_probe(struct apr_device *adev)
 {
        struct q6afe *afe;
        struct device *dev = &adev->dev;
-       struct device_node *dais_np;
 
        afe = devm_kzalloc(dev, sizeof(*afe), GFP_KERNEL);
        if (!afe)
@@ -1453,22 +1451,12 @@ static int q6afe_probe(struct apr_device *adev)
 
        dev_set_drvdata(dev, afe);
 
-       dais_np = of_get_child_by_name(dev->of_node, "dais");
-       if (dais_np) {
-               afe->pdev_dais = of_platform_device_create(dais_np,
-                                                          "q6afe-dai", dev);
-               of_node_put(dais_np);
-       }
-
-       return 0;
+       return of_platform_populate(dev->of_node, NULL, NULL, dev);
 }
 
 static int q6afe_remove(struct apr_device *adev)
 {
-       struct q6afe *afe = dev_get_drvdata(&adev->dev);
-
-       if (afe->pdev_dais)
-               of_platform_device_destroy(&afe->pdev_dais->dev, NULL);
+       of_platform_depopulate(&adev->dev);
 
        return 0;
 }