From 72e2c91df07645fe4597ab63bfcafae5ab7197a0 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Mar 2013 03:30:08 -0700 Subject: [PATCH] --- yaml --- r: 371823 b: refs/heads/master c: b56733bd2bd05aa28b44d42a807162c0922fc207 h: refs/heads/master i: 371821: 29026bb6677221caec2ffba078e5e2aaaa3190b2 371819: fa3f612fc71bf6ea74544e00f86026a8d60daaef 371815: d3b781654e95cb83a2d8e1e426327837a2da1362 371807: 7fabd7097d407b7caa166739a00dfd36e0795c80 v: v3 --- [refs] | 2 +- trunk/sound/soc/blackfin/bf5xx-i2s.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 03a4446f0875..691f78b6bbb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 514f6ac78b0b915760dd9b0f141504b262fa7ada +refs/heads/master: b56733bd2bd05aa28b44d42a807162c0922fc207 diff --git a/trunk/sound/soc/blackfin/bf5xx-i2s.c b/trunk/sound/soc/blackfin/bf5xx-i2s.c index 168d88bccb41..dd0c2a4f83a3 100644 --- a/trunk/sound/soc/blackfin/bf5xx-i2s.c +++ b/trunk/sound/soc/blackfin/bf5xx-i2s.c @@ -245,6 +245,10 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = { .ops = &bf5xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver bf5xx_i2s_component = { + .name = "bf5xx-i2s", +}; + static int bf5xx_i2s_probe(struct platform_device *pdev) { struct sport_device *sport_handle; @@ -257,7 +261,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev) return -ENODEV; /* register with the ASoC layers */ - ret = snd_soc_register_dai(&pdev->dev, &bf5xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &bf5xx_i2s_component, + &bf5xx_i2s_dai, 1); if (ret) { pr_err("Failed to register DAI: %d\n", ret); sport_done(sport_handle); @@ -273,7 +278,7 @@ static int bf5xx_i2s_remove(struct platform_device *pdev) pr_debug("%s enter\n", __func__); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); sport_done(sport_handle); return 0;