Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b2f349 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@linaro.org>
parent 0e7cb145

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

sound/soc/soc-io.c

+0 −7
Original line number Diff line number Diff line
@@ -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;