From 29026bb6677221caec2ffba078e5e2aaaa3190b2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Mar 2013 03:29:46 -0700 Subject: [PATCH] --- yaml --- r: 371821 b: refs/heads/master c: 3272c51bfab7db6e9dfd4deb4b99284abf2ed27c h: refs/heads/master i: 371819: fa3f612fc71bf6ea74544e00f86026a8d60daaef v: v3 --- [refs] | 2 +- trunk/sound/soc/blackfin/bf6xx-i2s.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bee6f59bc2e9..0d172bdea099 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbedf1b25586d1b148a85600f29aad2241514c6f +refs/heads/master: 3272c51bfab7db6e9dfd4deb4b99284abf2ed27c diff --git a/trunk/sound/soc/blackfin/bf6xx-i2s.c b/trunk/sound/soc/blackfin/bf6xx-i2s.c index 8f337972f438..c02405cc007d 100644 --- a/trunk/sound/soc/blackfin/bf6xx-i2s.c +++ b/trunk/sound/soc/blackfin/bf6xx-i2s.c @@ -186,6 +186,10 @@ static struct snd_soc_dai_driver bfin_i2s_dai = { .ops = &bfin_i2s_dai_ops, }; +static const struct snd_soc_component_driver bfin_i2s_component = { + .name = "bfin-i2s", +}; + static int bfin_i2s_probe(struct platform_device *pdev) { struct sport_device *sport; @@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(dev, &bfin_i2s_dai); + ret = snd_soc_register_component(dev, &bfin_i2s_component, + &bfin_i2s_dai, 1); if (ret) { dev_err(dev, "Failed to register DAI: %d\n", ret); sport_delete(sport); @@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev) { struct sport_device *sport = platform_get_drvdata(pdev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_delete(sport); return 0;