Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on jz4740 i2s
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent c22fd5e commit 29cc15c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sound/soc/jz4740/jz4740-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
.resume = jz4740_i2s_resume,
};

static const struct snd_soc_component_driver jz4740_i2s_component = {
.name = "jz4740-i2s",
};

static int jz4740_i2s_dev_probe(struct platform_device *pdev)
{
struct jz4740_i2s *i2s;
Expand Down Expand Up @@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
}

platform_set_drvdata(pdev, i2s);
ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai);
ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component,
&jz4740_i2s_dai, 1);

if (ret) {
dev_err(&pdev->dev, "Failed to register DAI\n");
Expand All @@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev)
{
struct jz4740_i2s *i2s = platform_get_drvdata(pdev);

snd_soc_unregister_dai(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);

clk_put(i2s->clk_i2s);
clk_put(i2s->clk_aic);
Expand Down

0 comments on commit 29cc15c

Please sign in to comment.