diff options
| author | Lars-Peter Clausen | 2014-11-10 22:41:50 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-11-18 16:37:58 +0100 |
| commit | 6794f709b7124ff1e574c4f4c9494418ab56c4b4 (patch) | |
| tree | 877945bb9094324a473578de317f6da7f3f99f22 /sound/soc/soc-core.c | |
| parent | ASoC: ac97: Drop support for setting platform data via the CPU DAI (diff) | |
| download | kernel-qcow2-linux-6794f709b7124ff1e574c4f4c9494418ab56c4b4.tar.gz kernel-qcow2-linux-6794f709b7124ff1e574c4f4c9494418ab56c4b4.tar.xz kernel-qcow2-linux-6794f709b7124ff1e574c4f4c9494418ab56c4b4.zip | |
ASoC: ac97: Drop delayed device registration
We have all the information and dependencies we need to initialize and
register the device available in snd_soc_new_ac97_codec(). So there is no
need to delay the device registration until after the card itself as been
registered.
This makes the code significantly simpler and also makes it possible to use
the AC'97 device in the CODECs probe function. The later will be required to
be able to convert the AC'97 CODEC drivers to regmap.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d883b4ad03ac..fba6e28e18d3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1671,10 +1671,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) goto probe_aux_dev_err; } - ret = snd_soc_ac97_register_dai_links(card); - if (ret < 0) - goto probe_aux_dev_err; - card->instantiated = 1; snd_soc_dapm_sync(&card->dapm); mutex_unlock(&card->mutex); |