diff options
Diffstat (limited to 'sound/soc/tegra/tegra20_ac97.c')
-rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 0a59e2383ef3..3b0fa12dbff7 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <sound/soc.h> | 37 | #include <sound/soc.h> |
38 | #include <sound/dmaengine_pcm.h> | 38 | #include <sound/dmaengine_pcm.h> |
39 | 39 | ||
40 | #include "tegra_asoc_utils.h" | ||
41 | #include "tegra20_ac97.h" | 40 | #include "tegra20_ac97.h" |
42 | 41 | ||
43 | #define DRV_NAME "tegra20-ac97" | 42 | #define DRV_NAME "tegra20-ac97" |
@@ -376,18 +375,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) | |||
376 | ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 375 | ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
377 | ac97->playback_dma_data.maxburst = 4; | 376 | ac97->playback_dma_data.maxburst = 4; |
378 | 377 | ||
379 | ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev); | ||
380 | if (ret) | ||
381 | goto err_clk_put; | ||
382 | |||
383 | ret = tegra_asoc_utils_set_ac97_rate(&ac97->util_data); | ||
384 | if (ret) | ||
385 | goto err_asoc_utils_fini; | ||
386 | |||
387 | ret = clk_prepare_enable(ac97->clk_ac97); | 378 | ret = clk_prepare_enable(ac97->clk_ac97); |
388 | if (ret) { | 379 | if (ret) { |
389 | dev_err(&pdev->dev, "clk_enable failed: %d\n", ret); | 380 | dev_err(&pdev->dev, "clk_enable failed: %d\n", ret); |
390 | goto err_asoc_utils_fini; | 381 | goto err; |
391 | } | 382 | } |
392 | 383 | ||
393 | ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops); | 384 | ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops); |
@@ -419,8 +410,6 @@ err_unregister_component: | |||
419 | snd_soc_unregister_component(&pdev->dev); | 410 | snd_soc_unregister_component(&pdev->dev); |
420 | err_clk_disable_unprepare: | 411 | err_clk_disable_unprepare: |
421 | clk_disable_unprepare(ac97->clk_ac97); | 412 | clk_disable_unprepare(ac97->clk_ac97); |
422 | err_asoc_utils_fini: | ||
423 | tegra_asoc_utils_fini(&ac97->util_data); | ||
424 | err_clk_put: | 413 | err_clk_put: |
425 | err: | 414 | err: |
426 | snd_soc_set_ac97_ops(NULL); | 415 | snd_soc_set_ac97_ops(NULL); |
@@ -434,8 +423,6 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev) | |||
434 | tegra_pcm_platform_unregister(&pdev->dev); | 423 | tegra_pcm_platform_unregister(&pdev->dev); |
435 | snd_soc_unregister_component(&pdev->dev); | 424 | snd_soc_unregister_component(&pdev->dev); |
436 | 425 | ||
437 | tegra_asoc_utils_fini(&ac97->util_data); | ||
438 | |||
439 | clk_disable_unprepare(ac97->clk_ac97); | 426 | clk_disable_unprepare(ac97->clk_ac97); |
440 | 427 | ||
441 | snd_soc_set_ac97_ops(NULL); | 428 | snd_soc_set_ac97_ops(NULL); |