| Message ID | 20180625143115.8346-7-srinivas.kandagatla@linaro.org |
|---|---|
| State | Accepted |
| Commit | 01afbd45f78cb0557db18c3ba768eea3e9576cfd |
| Headers | show |
| Series | ASoC: qdsp6: Fix dt based module loading | expand |
Acked-by: Niklas Cassel <niklas.cassel@linaro.org> On Mon, Jun 25, 2018 at 03:31:10PM +0100, Srinivas Kandagatla wrote: > 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> > --- > sound/soc/qcom/qdsp6/q6afe.c | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) > > diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c > index 01f43218984b..621b67b34db9 100644 > --- 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; > } > -- > 2.16.2 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 01f43218984b..621b67b34db9 100644 --- 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; }
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> --- sound/soc/qcom/qdsp6/q6afe.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -- 2.16.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html