summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 03:33:51 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 21:57:24 +0000
commited22853a5bf51736e5f7e42fddacd053e38ddf01 (patch)
tree701d2b526e9485f791b79257563fd9d431a46a2a
parent58709a329eaf4b61bc348305ec387b7964bb0320 (diff)
downloadop-kernel-dev-ed22853a5bf51736e5f7e42fddacd053e38ddf01.zip
op-kernel-dev-ed22853a5bf51736e5f7e42fddacd053e38ddf01.tar.gz
ASoC: switch over to use snd_soc_register_component() on omap dmic
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/omap/omap-dmic.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index ba49ccd..4c54542 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -448,6 +448,10 @@ static struct snd_soc_dai_driver omap_dmic_dai = {
.ops = &omap_dmic_dai_ops,
};
+static const struct snd_soc_component_driver omap_dmic_component = {
+ .name = "omap-dmic",
+};
+
static int asoc_dmic_probe(struct platform_device *pdev)
{
struct omap_dmic *dmic;
@@ -507,7 +511,8 @@ static int asoc_dmic_probe(struct platform_device *pdev)
goto err_put_clk;
}
- ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
+ ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
+ &omap_dmic_dai, 1);
if (ret)
goto err_put_clk;
@@ -522,7 +527,7 @@ static int asoc_dmic_remove(struct platform_device *pdev)
{
struct omap_dmic *dmic = platform_get_drvdata(pdev);
- snd_soc_unregister_dai(&pdev->dev);
+ snd_soc_unregister_component(&pdev->dev);
clk_put(dmic->fclk);
return 0;
OpenPOWER on IntegriCloud