diff options
Diffstat (limited to 'sound/soc/samsung/spdif.c')
-rw-r--r-- | sound/soc/samsung/spdif.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5008e5bd6ed8..2e5ebb2f1982 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -357,6 +357,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = { | |||
357 | .resume = spdif_resume, | 357 | .resume = spdif_resume, |
358 | }; | 358 | }; |
359 | 359 | ||
360 | static const struct snd_soc_component_driver samsung_spdif_component = { | ||
361 | .name = "samsung-spdif", | ||
362 | }; | ||
363 | |||
360 | static int spdif_probe(struct platform_device *pdev) | 364 | static int spdif_probe(struct platform_device *pdev) |
361 | { | 365 | { |
362 | struct s3c_audio_pdata *spdif_pdata; | 366 | struct s3c_audio_pdata *spdif_pdata; |
@@ -424,7 +428,8 @@ static int spdif_probe(struct platform_device *pdev) | |||
424 | 428 | ||
425 | dev_set_drvdata(&pdev->dev, spdif); | 429 | dev_set_drvdata(&pdev->dev, spdif); |
426 | 430 | ||
427 | ret = snd_soc_register_dai(&pdev->dev, &samsung_spdif_dai); | 431 | ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component, |
432 | &samsung_spdif_dai, 1); | ||
428 | if (ret != 0) { | 433 | if (ret != 0) { |
429 | dev_err(&pdev->dev, "fail to register dai\n"); | 434 | dev_err(&pdev->dev, "fail to register dai\n"); |
430 | goto err4; | 435 | goto err4; |
@@ -445,7 +450,7 @@ static int spdif_probe(struct platform_device *pdev) | |||
445 | 450 | ||
446 | return 0; | 451 | return 0; |
447 | err5: | 452 | err5: |
448 | snd_soc_unregister_dai(&pdev->dev); | 453 | snd_soc_unregister_component(&pdev->dev); |
449 | err4: | 454 | err4: |
450 | iounmap(spdif->regs); | 455 | iounmap(spdif->regs); |
451 | err3: | 456 | err3: |
@@ -466,7 +471,7 @@ static int spdif_remove(struct platform_device *pdev) | |||
466 | struct resource *mem_res; | 471 | struct resource *mem_res; |
467 | 472 | ||
468 | asoc_dma_platform_unregister(&pdev->dev); | 473 | asoc_dma_platform_unregister(&pdev->dev); |
469 | snd_soc_unregister_dai(&pdev->dev); | 474 | snd_soc_unregister_component(&pdev->dev); |
470 | 475 | ||
471 | iounmap(spdif->regs); | 476 | iounmap(spdif->regs); |
472 | 477 | ||