Commit f614c9b0 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown

ASoC: qdsp6: q6adm: 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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e43792c6
...@@ -64,7 +64,6 @@ struct q6adm { ...@@ -64,7 +64,6 @@ struct q6adm {
struct aprv2_ibasic_rsp_result_t result; struct aprv2_ibasic_rsp_result_t result;
struct mutex lock; struct mutex lock;
wait_queue_head_t matrix_map_wait; wait_queue_head_t matrix_map_wait;
struct platform_device *pdev_routing;
}; };
struct q6adm_cmd_device_open_v5 { struct q6adm_cmd_device_open_v5 {
...@@ -588,7 +587,6 @@ EXPORT_SYMBOL_GPL(q6adm_close); ...@@ -588,7 +587,6 @@ EXPORT_SYMBOL_GPL(q6adm_close);
static int q6adm_probe(struct apr_device *adev) static int q6adm_probe(struct apr_device *adev)
{ {
struct device *dev = &adev->dev; struct device *dev = &adev->dev;
struct device_node *dais_np;
struct q6adm *adm; struct q6adm *adm;
adm = devm_kzalloc(&adev->dev, sizeof(*adm), GFP_KERNEL); adm = devm_kzalloc(&adev->dev, sizeof(*adm), GFP_KERNEL);
...@@ -605,22 +603,12 @@ static int q6adm_probe(struct apr_device *adev) ...@@ -605,22 +603,12 @@ static int q6adm_probe(struct apr_device *adev)
INIT_LIST_HEAD(&adm->copps_list); INIT_LIST_HEAD(&adm->copps_list);
spin_lock_init(&adm->copps_list_lock); spin_lock_init(&adm->copps_list_lock);
dais_np = of_get_child_by_name(dev->of_node, "routing"); return of_platform_populate(dev->of_node, NULL, NULL, dev);
if (dais_np) {
adm->pdev_routing = of_platform_device_create(dais_np,
"q6routing", dev);
of_node_put(dais_np);
}
return 0;
} }
static int q6adm_remove(struct apr_device *adev) static int q6adm_remove(struct apr_device *adev)
{ {
struct q6adm *adm = dev_get_drvdata(&adev->dev); of_platform_depopulate(&adev->dev);
if (adm->pdev_routing)
of_platform_device_destroy(&adm->pdev_routing->dev, NULL);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment