On Mon, Jun 25, 2018 at 03:31:09PM +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@xxxxxxxxxx>
> ---
> sound/soc/qcom/qdsp6/q6asm.c | 17 ++---------------
> 1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
> index 530852385cad..2b2c7233bb5f 100644
> --- a/sound/soc/qcom/qdsp6/q6asm.c
> +++ b/sound/soc/qcom/qdsp6/q6asm.c
> @@ -174,10 +174,8 @@ struct q6asm {
> struct device *dev;
> struct q6core_svc_api_info ainfo;
> wait_queue_head_t mem_wait;
> - struct platform_device *pcmdev;
Why is this removed?
If it's a cleanup, perhaps it should be in a separate patch.
> spinlock_t slock;
> struct audio_client *session[MAX_SESSIONS + 1];
> - struct platform_device *pdev_dais;
> };
>
> struct audio_client {
> @@ -1344,7 +1342,6 @@ EXPORT_SYMBOL_GPL(q6asm_cmd_nowait);
> static int q6asm_probe(struct apr_device *adev)
> {
> struct device *dev = &adev->dev;
> - struct device_node *dais_np;
> struct q6asm *q6asm;
>
> q6asm = devm_kzalloc(dev, sizeof(*q6asm), GFP_KERNEL);
> @@ -1359,22 +1356,12 @@ static int q6asm_probe(struct apr_device *adev)
> spin_lock_init(&q6asm->slock);
> dev_set_drvdata(dev, q6asm);
>
> - dais_np = of_get_child_by_name(dev->of_node, "dais");
> - if (dais_np) {
> - q6asm->pdev_dais = of_platform_device_create(dais_np,
> - "q6asm-dai", dev);
> - of_node_put(dais_np);
> - }
> -
> - return 0;
> + return of_platform_populate(dev->of_node, NULL, NULL, dev);
> }
>
> static int q6asm_remove(struct apr_device *adev)
> {
> - struct q6asm *q6asm = dev_get_drvdata(&adev->dev);
> -
> - if (q6asm->pdev_dais)
> - of_platform_device_destroy(&q6asm->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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
