summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-io.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4334ab25c5d5..6424b10ac29c 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -258,8 +258,7 @@ 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_CUSTOM = 1,
- SND_SOC_I2C,
+ SND_SOC_I2C = 1,
SND_SOC_SPI,
};
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index df9338aa1a52..cca490c80589 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -367,9 +367,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
switch (control) {
- case SND_SOC_CUSTOM:
- break;
-
case SND_SOC_I2C:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
codec->hw_write = (hw_write_t)i2c_master_send;