diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 22:13:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 22:14:43 +0000 |
| commit | fe3e78e073d25308756f38019956061153267769 (patch) | |
| tree | 6590150d5c67f8a5889f3d254fe82e5abf46f83a /sound/soc/codecs/pcm3008.c | |
| parent | 2624d5fa67a5d3d720613a4ab0672e8c387ba806 (diff) | |
| download | blackbird-op-linux-fe3e78e073d25308756f38019956061153267769.tar.gz blackbird-op-linux-fe3e78e073d25308756f38019956061153267769.zip | |
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/pcm3008.c')
| -rw-r--r-- | sound/soc/codecs/pcm3008.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c index 5cda9e6b5a74..2afcd0a8669d 100644 --- a/sound/soc/codecs/pcm3008.c +++ b/sound/soc/codecs/pcm3008.c @@ -90,13 +90,6 @@ static int pcm3008_soc_probe(struct platform_device *pdev) goto pcm_err; } - /* Register Card. */ - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "pcm3008: failed to register card\n"); - goto card_err; - } - /* DEM1 DEM0 DE-EMPHASIS_MODE * Low Low De-emphasis 44.1 kHz ON * Low High De-emphasis OFF @@ -136,8 +129,6 @@ static int pcm3008_soc_probe(struct platform_device *pdev) gpio_err: pcm3008_gpio_free(setup); -card_err: - snd_soc_free_pcms(socdev); pcm_err: kfree(socdev->card->codec); |
