Skip to content

Commit

Permalink
ASoC: io: Remove SND_SOC_I2C
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Feb 23, 2014
1 parent 0e7cb14 commit 56b2f34
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
1 change: 0 additions & 1 deletion include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
7 changes: 0 additions & 7 deletions sound/soc/soc-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 56b2f34

Please sign in to comment.