diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:29:46 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:24 -0400 |
commit | 3272c51bfab7db6e9dfd4deb4b99284abf2ed27c (patch) | |
tree | 14ec2dd68597e3358b997c4a943fedf09ea05468 | |
parent | bbedf1b25586d1b148a85600f29aad2241514c6f (diff) |
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>
-rw-r--r-- | sound/soc/blackfin/bf6xx-i2s.c | 9 |
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 = { | |||
186 | .ops = &bfin_i2s_dai_ops, | 186 | .ops = &bfin_i2s_dai_ops, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static const struct snd_soc_component_driver bfin_i2s_component = { | ||
190 | .name = "bfin-i2s", | ||
191 | }; | ||
192 | |||
189 | static int bfin_i2s_probe(struct platform_device *pdev) | 193 | static int bfin_i2s_probe(struct platform_device *pdev) |
190 | { | 194 | { |
191 | struct sport_device *sport; | 195 | struct sport_device *sport; |
@@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev) | |||
197 | return -ENODEV; | 201 | return -ENODEV; |
198 | 202 | ||
199 | /* register with the ASoC layers */ | 203 | /* register with the ASoC layers */ |
200 | ret = snd_soc_register_dai(dev, &bfin_i2s_dai); | 204 | ret = snd_soc_register_component(dev, &bfin_i2s_component, |
205 | &bfin_i2s_dai, 1); | ||
201 | if (ret) { | 206 | if (ret) { |
202 | dev_err(dev, "Failed to register DAI: %d\n", ret); | 207 | dev_err(dev, "Failed to register DAI: %d\n", ret); |
203 | sport_delete(sport); | 208 | sport_delete(sport); |
@@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev) | |||
212 | { | 217 | { |
213 | struct sport_device *sport = platform_get_drvdata(pdev); | 218 | struct sport_device *sport = platform_get_drvdata(pdev); |
214 | 219 | ||
215 | snd_soc_unregister_dai(&pdev->dev); | 220 | snd_soc_unregister_component(&pdev->dev); |
216 | sport_delete(sport); | 221 | sport_delete(sport); |
217 | 222 | ||
218 | return 0; | 223 | return 0; |