From 7fabd7097d407b7caa166739a00dfd36e0795c80 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 14 Mar 2013 00:19:20 -0700 Subject: [PATCH] --- yaml --- r: 371807 b: refs/heads/master c: da4f2f9e6b59d9236fec1d5cfc85dd3b5679d1b3 h: refs/heads/master i: 371805: a971632488d8e51c97ece2729a9511deb2c8d6d1 371803: 341e08f349bdc6d5dab49524b2d29810a2b6b499 371799: f2e02a42c19433d7edaec90e964c41669325783f 371791: b89285fff8f6fed2818c4219179d7cdd828822fd 371775: a5f5b5110f98cce1a28748d668d9b8793bdbd41b v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/fsi.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7aa4ea55d68d..228a38d3ec98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61782e4f5eb593958582524aad9b14dc98b1b56c +refs/heads/master: da4f2f9e6b59d9236fec1d5cfc85dd3b5679d1b3 diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c index c724026a246f..254c6375f7a1 100644 --- a/trunk/sound/soc/sh/fsi.c +++ b/trunk/sound/soc/sh/fsi.c @@ -1886,6 +1886,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = { .pcm_free = fsi_pcm_free, }; +static const struct snd_soc_component_driver fsi_soc_component = { + .name = "fsi", +}; + /* * platform function */ @@ -2046,10 +2050,10 @@ static int fsi_probe(struct platform_device *pdev) goto exit_fsib; } - ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai, - ARRAY_SIZE(fsi_soc_dai)); + ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component, + fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai)); if (ret < 0) { - dev_err(&pdev->dev, "cannot snd dai register\n"); + dev_err(&pdev->dev, "cannot snd component register\n"); goto exit_snd_soc; } @@ -2074,7 +2078,7 @@ static int fsi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai)); + snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); fsi_stream_remove(&master->fsia);