diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 17:13:13 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 17:14:43 -0500 |
commit | fe3e78e073d25308756f38019956061153267769 (patch) | |
tree | 6590150d5c67f8a5889f3d254fe82e5abf46f83a /sound/soc/codecs/cs4270.c | |
parent | 2624d5fa67a5d3d720613a4ab0672e8c387ba806 (diff) |
ASoC: Factor out snd_soc_init_card()
snd_soc_init_card() is always called as the last part of the CODEC probe
function so we can factor it out into the core card setup rather than
have each CODEC replicate the code to do the initialiastation. This will
be required to support multiple CODECs per card.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/cs4270.c')
-rw-r--r-- | sound/soc/codecs/cs4270.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 565842dcfc65..ffe122d1cd76 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -599,13 +599,6 @@ static int cs4270_probe(struct platform_device *pdev) | |||
599 | goto error_free_pcms; | 599 | goto error_free_pcms; |
600 | } | 600 | } |
601 | 601 | ||
602 | /* And finally, register the socdev */ | ||
603 | ret = snd_soc_init_card(socdev); | ||
604 | if (ret < 0) { | ||
605 | dev_err(codec->dev, "failed to register card\n"); | ||
606 | goto error_free_pcms; | ||
607 | } | ||
608 | |||
609 | return 0; | 602 | return 0; |
610 | 603 | ||
611 | error_free_pcms: | 604 | error_free_pcms: |