diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-08 12:46:36 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-03 08:06:41 -0400 |
commit | 210cb67cb5b9f9a23b7ce91de50bab357440ba9d (patch) | |
tree | aecabeefa9269d385583b0aa2a54e6a7eac362f1 /sound/soc/soc-io.c | |
parent | 51cc7ed3e378a60a3413a7e424f536e4dec3f39d (diff) |
ASoC: io: Use dev_get_regmap() if driver doesn't provide a regmap
Less error prone and one less line of code in drivers.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-io.c')
-rw-r--r-- | sound/soc/soc-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 4d8dc6a27d4d..44d0174b4d97 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c | |||
@@ -142,6 +142,8 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, | |||
142 | case SND_SOC_REGMAP: | 142 | case SND_SOC_REGMAP: |
143 | /* Device has made its own regmap arrangements */ | 143 | /* Device has made its own regmap arrangements */ |
144 | codec->using_regmap = true; | 144 | codec->using_regmap = true; |
145 | if (!codec->control_data) | ||
146 | codec->control_data = dev_get_regmap(codec->dev, NULL); | ||
145 | 147 | ||
146 | ret = regmap_get_val_bytes(codec->control_data); | 148 | ret = regmap_get_val_bytes(codec->control_data); |
147 | /* Errors are legitimate for non-integer byte multiples */ | 149 | /* Errors are legitimate for non-integer byte multiples */ |