p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: qdsp6: q6routing: remove component framework related code 

Now that the component framework is integrated into the ASoC core,
remove any redundant code in this driver.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2018-07-13 16:36:31 +01:00 committed by Mark Brown
parent f924e4fd89
commit 791940779d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/qcom/qdsp6/q6routing.c
View File

@ -8,7 +8,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/component.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -977,9 +976,10 @@ static const struct snd_soc_component_driver msm_soc_routing_component = {
.num_dapm_routes = ARRAY_SIZE(intercon), .num_dapm_routes = ARRAY_SIZE(intercon),
}; };
static int q6routing_dai_bind(struct device *dev, struct device *master, static int q6pcm_routing_probe(struct platform_device *pdev)
void *data)
{ {
struct device *dev = &pdev->dev;
routing_data = kzalloc(sizeof(*routing_data), GFP_KERNEL); routing_data = kzalloc(sizeof(*routing_data), GFP_KERNEL);
if (!routing_data) if (!routing_data)
return -ENOMEM; return -ENOMEM;
@ -989,35 +989,15 @@ static int q6routing_dai_bind(struct device *dev, struct device *master,
mutex_init(&routing_data->lock); mutex_init(&routing_data->lock);
dev_set_drvdata(dev, routing_data); dev_set_drvdata(dev, routing_data);
return snd_soc_register_component(dev, &msm_soc_routing_component, return devm_snd_soc_register_component(dev, &msm_soc_routing_component,
NULL, 0); NULL, 0);
} }
static void q6routing_dai_unbind(struct device *dev, struct device *master,
void *d)
{
struct msm_routing_data *data = dev_get_drvdata(dev);
snd_soc_unregister_component(dev);
kfree(data);
routing_data = NULL;
}
static const struct component_ops q6routing_dai_comp_ops = {
.bind = q6routing_dai_bind,
.unbind = q6routing_dai_unbind,
};
static int q6pcm_routing_probe(struct platform_device *pdev)
{
return component_add(&pdev->dev, &q6routing_dai_comp_ops);
}
static int q6pcm_routing_remove(struct platform_device *pdev) static int q6pcm_routing_remove(struct platform_device *pdev)
{ {
component_del(&pdev->dev, &q6routing_dai_comp_ops); kfree(routing_data);
routing_data = NULL;
return 0; return 0;
} }