ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:05:58 +0000 (19:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:17:55 +0000 (19:17 +0100)
This will be removed in -next so let's drop it from mainline as soon as
we can in order to minimise surprises.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
include/sound/soc.h
sound/soc/soc-cache.c

index f1de3e0c75bcad1da0cbed760272fe5e190bccdc..3a4bd3a3c68d25cb2ccd6896a2750a761668937a 100644 (file)
@@ -248,8 +248,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,
 };
 
index c005ceb70c9d1dfc624ffa11a13eec427e2215b9..039b9532b270cb8c1bb300efd0d1a7f385d95aa4 100644 (file)
@@ -409,9 +409,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;