diff options
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ac97.c')
-rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index 8e41bcb020eb..490217325975 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c | |||
@@ -282,6 +282,10 @@ static struct snd_soc_dai_driver bfin_ac97_dai = { | |||
282 | .formats = SNDRV_PCM_FMTBIT_S16_LE, }, | 282 | .formats = SNDRV_PCM_FMTBIT_S16_LE, }, |
283 | }; | 283 | }; |
284 | 284 | ||
285 | static const struct snd_soc_component_driver bfin_ac97_component = { | ||
286 | .name = "bfin-ac97", | ||
287 | }; | ||
288 | |||
285 | static int asoc_bfin_ac97_probe(struct platform_device *pdev) | 289 | static int asoc_bfin_ac97_probe(struct platform_device *pdev) |
286 | { | 290 | { |
287 | struct sport_device *sport_handle; | 291 | struct sport_device *sport_handle; |
@@ -331,7 +335,8 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) | |||
331 | goto sport_config_err; | 335 | goto sport_config_err; |
332 | } | 336 | } |
333 | 337 | ||
334 | ret = snd_soc_register_dai(&pdev->dev, &bfin_ac97_dai); | 338 | ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component, |
339 | &bfin_ac97_dai, 1); | ||
335 | if (ret) { | 340 | if (ret) { |
336 | pr_err("Failed to register DAI: %d\n", ret); | 341 | pr_err("Failed to register DAI: %d\n", ret); |
337 | goto sport_config_err; | 342 | goto sport_config_err; |
@@ -356,7 +361,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev) | |||
356 | { | 361 | { |
357 | struct sport_device *sport_handle = platform_get_drvdata(pdev); | 362 | struct sport_device *sport_handle = platform_get_drvdata(pdev); |
358 | 363 | ||
359 | snd_soc_unregister_dai(&pdev->dev); | 364 | snd_soc_unregister_component(&pdev->dev); |
360 | sport_done(sport_handle); | 365 | sport_done(sport_handle); |
361 | #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET | 366 | #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET |
362 | gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); | 367 | gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM); |