diff options
| author | Xiubo Li | 2014-03-26 06:40:23 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-04-14 18:22:18 +0200 |
| commit | a39f75f7907fa3a708751dc283e3ab3e7da526b8 (patch) | |
| tree | 464d1902678907ac8ab6f8999f6f49381e0fcaa2 /sound/soc/soc-io.c | |
| parent | Linux 3.15-rc1 (diff) | |
| download | kernel-qcow2-linux-a39f75f7907fa3a708751dc283e3ab3e7da526b8.tar.gz kernel-qcow2-linux-a39f75f7907fa3a708751dc283e3ab3e7da526b8.tar.xz kernel-qcow2-linux-a39f75f7907fa3a708751dc283e3ab3e7da526b8.zip | |
ASoC: core: Move the default regmap I/O setting to snd_soc_register_codec()
Add the default regmap I/O setting to snd_soc_register_codec() while
the CODEC is initialising, which will be called by CODEC driver device
probe(), and then we can make XXX_set_cache_io() go away entirely from each
CODEC ASoC probe.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-io.c')
| -rw-r--r-- | sound/soc/soc-io.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 260efc8466fc..6480e8f29310 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -60,14 +60,11 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, { int ret; - /* Device has made its own regmap arrangements */ if (!regmap) - codec->control_data = dev_get_regmap(codec->dev, NULL); - else - codec->control_data = regmap; + return -EINVAL; - if (IS_ERR(codec->control_data)) - return PTR_ERR(codec->control_data); + /* Device has made its own regmap arrangements */ + codec->control_data = regmap; codec->write = hw_write; codec->read = hw_read; |