Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on omap dmic
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent 58709a3 commit ed22853
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sound/soc/omap/omap-dmic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down

0 comments on commit ed22853

Please sign in to comment.