diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:30:20 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:25 -0400 |
commit | 58309649b4feadea44c5cc3e5d410c34d81ef5d1 (patch) | |
tree | 89a5d4c277a1b98854808e404853245a06f350b2 /sound/soc/blackfin/bf5xx-tdm.c | |
parent | b56733bd2bd05aa28b44d42a807162c0922fc207 (diff) |
ASoC: switch over to use snd_soc_register_component() on bf5xx tdm
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/bf5xx-tdm.c')
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c index c1e516ec53ad..69e9a3e935bd 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c | |||
@@ -249,6 +249,10 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = { | |||
249 | .ops = &bf5xx_tdm_dai_ops, | 249 | .ops = &bf5xx_tdm_dai_ops, |
250 | }; | 250 | }; |
251 | 251 | ||
252 | static const struct snd_soc_component_driver bf5xx_tdm_component = { | ||
253 | .name = "bf5xx-tdm", | ||
254 | }; | ||
255 | |||
252 | static int bfin_tdm_probe(struct platform_device *pdev) | 256 | static int bfin_tdm_probe(struct platform_device *pdev) |
253 | { | 257 | { |
254 | struct sport_device *sport_handle; | 258 | struct sport_device *sport_handle; |
@@ -282,7 +286,8 @@ static int bfin_tdm_probe(struct platform_device *pdev) | |||
282 | goto sport_config_err; | 286 | goto sport_config_err; |
283 | } | 287 | } |
284 | 288 | ||
285 | ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai); | 289 | ret = snd_soc_register_component(&pdev->dev, &bf5xx_tdm_component, |
290 | &bf5xx_tdm_dai, 1); | ||
286 | if (ret) { | 291 | if (ret) { |
287 | pr_err("Failed to register DAI: %d\n", ret); | 292 | pr_err("Failed to register DAI: %d\n", ret); |
288 | goto sport_config_err; | 293 | goto sport_config_err; |
@@ -299,7 +304,7 @@ static int bfin_tdm_remove(struct platform_device *pdev) | |||
299 | { | 304 | { |
300 | struct sport_device *sport_handle = platform_get_drvdata(pdev); | 305 | struct sport_device *sport_handle = platform_get_drvdata(pdev); |
301 | 306 | ||
302 | snd_soc_unregister_dai(&pdev->dev); | 307 | snd_soc_unregister_component(&pdev->dev); |
303 | sport_done(sport_handle); | 308 | sport_done(sport_handle); |
304 | 309 | ||
305 | return 0; | 310 | return 0; |