From: Mark Brown broonie@linaro.org
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 --- include/sound/soc.h | 1 - sound/soc/soc-io.c | 7 ------- 2 files changed, 8 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index 21038e0..de07934 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -355,7 +355,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 3a0d99e..add99e2 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;