diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-20 09:06:30 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-23 13:20:42 +0900 |
| commit | 56b2f349137bfdd23e498f12a97fe3d6139c097b (patch) | |
| tree | 94f0632a5826aab8444f24a0d2a9c7ea00672dfa | |
| parent | 0e7cb145122f294aafc8bb1fa7c0d3544216d2cf (diff) | |
| download | linux-stable-56b2f349137bfdd23e498f12a97fe3d6139c097b.tar.gz linux-stable-56b2f349137bfdd23e498f12a97fe3d6139c097b.tar.bz2 linux-stable-56b2f349137bfdd23e498f12a97fe3d6139c097b.zip | |
ASoC: io: Remove SND_SOC_I2C
Now that all users have been converted to regmap we can eliminate the ASoC
level wrapper for I2C I/O reducing the amount of duplicated functionality.
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | include/sound/soc.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-io.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6197ba0642cc..6d0b6cb9c484 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -341,7 +341,6 @@ typedef int (*hw_write_t)(void *,const char* ,int); extern struct snd_ac97_bus_ops *soc_ac97_ops; enum snd_soc_control_type { - SND_SOC_I2C = 1, SND_SOC_REGMAP, }; diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 3a0d99edf030..add99e2f7996 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -99,13 +99,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, config.val_bits = data_bits; switch (control) { -#if IS_ENABLED(CONFIG_REGMAP_I2C) - case SND_SOC_I2C: - codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev), - &config); - break; -#endif - case SND_SOC_REGMAP: /* Device has made its own regmap arrangements */ codec->using_regmap = true; |