diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-05-17 05:26:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-17 07:07:49 -0400 |
commit | 7d0cd22382f80243e7fce16f6bfc0720d5688370 (patch) | |
tree | 4a30f662fb45e59de7ac0155d2eb7c1e6b42d171 | |
parent | 2b581074357c42f63ae827ee28c9f244b91a38ac (diff) |
ASoC: simplify registration of snd-soc-dummy device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/soc-utils.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 4b3be6c3c91e..29b211e9c060 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c | |||
@@ -159,15 +159,10 @@ int __init snd_soc_util_init(void) | |||
159 | { | 159 | { |
160 | int ret; | 160 | int ret; |
161 | 161 | ||
162 | soc_dummy_dev = platform_device_alloc("snd-soc-dummy", -1); | 162 | soc_dummy_dev = |
163 | if (!soc_dummy_dev) | 163 | platform_device_register_simple("snd-soc-dummy", -1, NULL, 0); |
164 | return -ENOMEM; | 164 | if (IS_ERR(soc_dummy_dev)) |
165 | 165 | return PTR_ERR(soc_dummy_dev); | |
166 | ret = platform_device_add(soc_dummy_dev); | ||
167 | if (ret != 0) { | ||
168 | platform_device_put(soc_dummy_dev); | ||
169 | return ret; | ||
170 | } | ||
171 | 166 | ||
172 | ret = platform_driver_register(&soc_dummy_driver); | 167 | ret = platform_driver_register(&soc_dummy_driver); |
173 | if (ret != 0) | 168 | if (ret != 0) |