diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:36:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:57:42 -0400 |
commit | 1dfec3954e9884c79ee29c430811264318268365 (patch) | |
tree | c14f70c8fbde42d03c3ec1607fe32bf8e89f41a8 | |
parent | fc466ba3ee01cef840523f9bbbf6811e111168c3 (diff) |
ASoC: switch over to use snd_soc_register_component() on goni_wm8994
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index d37ede58e0a8..415ad81999c4 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c | |||
@@ -218,6 +218,10 @@ static struct snd_soc_dai_driver voice_dai = { | |||
218 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 218 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, |
219 | }; | 219 | }; |
220 | 220 | ||
221 | static const struct snd_soc_component_driver voice_component = { | ||
222 | .name = "goni-voice", | ||
223 | }; | ||
224 | |||
221 | static struct snd_soc_ops goni_voice_ops = { | 225 | static struct snd_soc_ops goni_voice_ops = { |
222 | .hw_params = goni_voice_hw_params, | 226 | .hw_params = goni_voice_hw_params, |
223 | }; | 227 | }; |
@@ -270,7 +274,8 @@ static int __init goni_init(void) | |||
270 | return -ENOMEM; | 274 | return -ENOMEM; |
271 | 275 | ||
272 | /* register voice DAI here */ | 276 | /* register voice DAI here */ |
273 | ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai); | 277 | ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component, |
278 | &voice_dai, 1); | ||
274 | if (ret) { | 279 | if (ret) { |
275 | platform_device_put(goni_snd_device); | 280 | platform_device_put(goni_snd_device); |
276 | return ret; | 281 | return ret; |
@@ -280,7 +285,7 @@ static int __init goni_init(void) | |||
280 | ret = platform_device_add(goni_snd_device); | 285 | ret = platform_device_add(goni_snd_device); |
281 | 286 | ||
282 | if (ret) { | 287 | if (ret) { |
283 | snd_soc_unregister_dai(&goni_snd_device->dev); | 288 | snd_soc_unregister_component(&goni_snd_device->dev); |
284 | platform_device_put(goni_snd_device); | 289 | platform_device_put(goni_snd_device); |
285 | } | 290 | } |
286 | 291 | ||
@@ -289,7 +294,7 @@ static int __init goni_init(void) | |||
289 | 294 | ||
290 | static void __exit goni_exit(void) | 295 | static void __exit goni_exit(void) |
291 | { | 296 | { |
292 | snd_soc_unregister_dai(&goni_snd_device->dev); | 297 | snd_soc_unregister_component(&goni_snd_device->dev); |
293 | platform_device_unregister(goni_snd_device); | 298 | platform_device_unregister(goni_snd_device); |
294 | } | 299 | } |
295 | 300 | ||