summaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bf6xx-i2s.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 03:29:46 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 21:55:24 +0000
commit3272c51bfab7db6e9dfd4deb4b99284abf2ed27c (patch)
tree14ec2dd68597e3358b997c4a943fedf09ea05468 /sound/soc/blackfin/bf6xx-i2s.c
parentbbedf1b25586d1b148a85600f29aad2241514c6f (diff)
downloadtalos-op-linux-3272c51bfab7db6e9dfd4deb4b99284abf2ed27c.tar.gz
talos-op-linux-3272c51bfab7db6e9dfd4deb4b99284abf2ed27c.zip
ASoC: switch over to use snd_soc_register_component() on bf6xx i2s
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/blackfin/bf6xx-i2s.c')
-rw-r--r--sound/soc/blackfin/bf6xx-i2s.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c
index 8f337972f438..c02405cc007d 100644
--- a/sound/soc/blackfin/bf6xx-i2s.c
+++ b/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;
OpenPOWER on IntegriCloud