diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-14 03:19:20 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-14 21:24:57 -0400 |
commit | da4f2f9e6b59d9236fec1d5cfc85dd3b5679d1b3 (patch) | |
tree | 7594fe4d3fa5d3c5883ec79b2df4ccc4212f5eb9 | |
parent | 61782e4f5eb593958582524aad9b14dc98b1b56c (diff) |
ASoC: fsi: use snd_soc_register_component() instead of snd_soc_register_dais()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/sh/fsi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index c724026a246f..254c6375f7a1 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c | |||
@@ -1886,6 +1886,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = { | |||
1886 | .pcm_free = fsi_pcm_free, | 1886 | .pcm_free = fsi_pcm_free, |
1887 | }; | 1887 | }; |
1888 | 1888 | ||
1889 | static const struct snd_soc_component_driver fsi_soc_component = { | ||
1890 | .name = "fsi", | ||
1891 | }; | ||
1892 | |||
1889 | /* | 1893 | /* |
1890 | * platform function | 1894 | * platform function |
1891 | */ | 1895 | */ |
@@ -2046,10 +2050,10 @@ static int fsi_probe(struct platform_device *pdev) | |||
2046 | goto exit_fsib; | 2050 | goto exit_fsib; |
2047 | } | 2051 | } |
2048 | 2052 | ||
2049 | ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai, | 2053 | ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component, |
2050 | ARRAY_SIZE(fsi_soc_dai)); | 2054 | fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai)); |
2051 | if (ret < 0) { | 2055 | if (ret < 0) { |
2052 | dev_err(&pdev->dev, "cannot snd dai register\n"); | 2056 | dev_err(&pdev->dev, "cannot snd component register\n"); |
2053 | goto exit_snd_soc; | 2057 | goto exit_snd_soc; |
2054 | } | 2058 | } |
2055 | 2059 | ||
@@ -2074,7 +2078,7 @@ static int fsi_remove(struct platform_device *pdev) | |||
2074 | 2078 | ||
2075 | pm_runtime_disable(&pdev->dev); | 2079 | pm_runtime_disable(&pdev->dev); |
2076 | 2080 | ||
2077 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai)); | 2081 | snd_soc_unregister_component(&pdev->dev); |
2078 | snd_soc_unregister_platform(&pdev->dev); | 2082 | snd_soc_unregister_platform(&pdev->dev); |
2079 | 2083 | ||
2080 | fsi_stream_remove(&master->fsia); | 2084 | fsi_stream_remove(&master->fsia); |