ASoC: switch over to use snd_soc_register_component() on jz4740 i2s

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>
This commit is contained in:
Kuninori Morimoto 2013-03-21 03:32:28 -07:00 committed by Mark Brown
parent c22fd5ef0f
commit 29cc15cfd2
1 changed files with 7 additions and 2 deletions

View File

@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
.resume = jz4740_i2s_resume, .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) static int jz4740_i2s_dev_probe(struct platform_device *pdev)
{ {
struct jz4740_i2s *i2s; struct jz4740_i2s *i2s;
@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
} }
platform_set_drvdata(pdev, i2s); 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) { if (ret) {
dev_err(&pdev->dev, "Failed to register DAI\n"); dev_err(&pdev->dev, "Failed to register DAI\n");
@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev)
{ {
struct jz4740_i2s *i2s = platform_get_drvdata(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_i2s);
clk_put(i2s->clk_aic); clk_put(i2s->clk_aic);