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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6197ba0642cc98df6c9c81663289866a154cced6..6d0b6cb9c484cdff9deac8d45581f54e214c8374 100644 (file)
--- 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 3a0d99edf030607918bc13e501b05f798bc3d16d..add99e2f7996e38fc71ba578583878fb0dddae46 100644 (file)
--- 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;