From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: broonie@kernel.org, lgirdwood@gmail.com, alsa-devel@alsa-project.org
Cc: perex@perex.cz, tiwai@suse.com, vkoul@kernel.org,
linux-kernel@vger.kernel.org, rohitkr@codeaurora.org,
bgoswami@codeaurora.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH v2 3/5] ASoC: qdsp6: q6asm-dai: remove component framework related code
Date: Fri, 13 Jul 2018 16:36:30 +0100 [thread overview]
Message-ID: <20180713153632.32511-4-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20180713153632.32511-1-srinivas.kandagatla@linaro.org>
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>
---
sound/soc/qcom/qdsp6/q6asm-dai.c | 35 ++++-------------------------------
1 file changed, 4 insertions(+), 31 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 199d0fb6f90a..9db9a2944ef2 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -7,7 +7,6 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <linux/component.h>
#include <sound/soc.h>
#include <sound/soc.h>
#include <sound/soc-dapm.h>
@@ -563,14 +562,15 @@ static struct snd_soc_dai_driver q6asm_fe_dais[] = {
Q6ASM_FEDAI_DRIVER(8),
};
-static int q6asm_dai_bind(struct device *dev, struct device *master, void *data)
+static int q6asm_dai_probe(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
struct of_phandle_args args;
struct q6asm_dai_data *pdata;
int rc;
- pdata = kzalloc(sizeof(struct q6asm_dai_data), GFP_KERNEL);
+ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return -ENOMEM;
@@ -582,36 +582,10 @@ static int q6asm_dai_bind(struct device *dev, struct device *master, void *data)
dev_set_drvdata(dev, pdata);
- return snd_soc_register_component(dev, &q6asm_fe_dai_component,
+ return devm_snd_soc_register_component(dev, &q6asm_fe_dai_component,
q6asm_fe_dais,
ARRAY_SIZE(q6asm_fe_dais));
}
-static void q6asm_dai_unbind(struct device *dev, struct device *master,
- void *data)
-{
- struct q6asm_dai_data *pdata = dev_get_drvdata(dev);
-
- snd_soc_unregister_component(dev);
-
- kfree(pdata);
-
-}
-
-static const struct component_ops q6asm_dai_comp_ops = {
- .bind = q6asm_dai_bind,
- .unbind = q6asm_dai_unbind,
-};
-
-static int q6asm_dai_probe(struct platform_device *pdev)
-{
- return component_add(&pdev->dev, &q6asm_dai_comp_ops);
-}
-
-static int q6asm_dai_dev_remove(struct platform_device *pdev)
-{
- component_del(&pdev->dev, &q6asm_dai_comp_ops);
- return 0;
-}
static const struct of_device_id q6asm_dai_device_id[] = {
{ .compatible = "qcom,q6asm-dais" },
@@ -625,7 +599,6 @@ static struct platform_driver q6asm_dai_platform_driver = {
.of_match_table = of_match_ptr(q6asm_dai_device_id),
},
.probe = q6asm_dai_probe,
- .remove = q6asm_dai_dev_remove,
};
module_platform_driver(q6asm_dai_platform_driver);
--
2.16.2
next prev parent reply other threads:[~2018-07-13 15:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 15:36 [PATCH v2 0/5] ASoC: core: add support to card re-bind using component framework Srinivas Kandagatla
2018-07-13 15:36 ` [PATCH v2 1/5] " Srinivas Kandagatla
2018-07-18 12:29 ` Applied "ASoC: core: add support to card re-bind using component framework" to the asoc tree Mark Brown
2018-07-13 15:36 ` [PATCH v2 2/5] ASoC: qdsp6: q6afe-dai: remove component fw related code Srinivas Kandagatla
2018-07-18 12:28 ` Applied "ASoC: qdsp6: q6afe-dai: remove component fw related code" to the asoc tree Mark Brown
2018-07-13 15:36 ` Srinivas Kandagatla [this message]
2018-07-18 12:28 ` Applied "ASoC: qdsp6: q6asm-dai: remove component framework " Mark Brown
2018-07-13 15:36 ` [PATCH v2 4/5] ASoC: qdsp6: q6routing: remove component framework related code Srinivas Kandagatla
2018-07-18 12:27 ` Applied "ASoC: qdsp6: q6routing: remove component framework related code" to the asoc tree Mark Brown
2018-07-13 15:36 ` [PATCH v2 5/5] ASoC: qcom: apq8096: remove component framework related code Srinivas Kandagatla
2018-07-18 12:27 ` Applied "ASoC: qcom: apq8096: remove component framework related code" to the asoc tree Mark Brown
2018-07-16 4:26 ` [PATCH v2 0/5] ASoC: core: add support to card re-bind using component framework Vinod
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180713153632.32511-4-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=rohitkr@codeaurora.org \
--cc=tiwai@suse.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).