From: Mark Brown <broonie@linaro.org>
Date: Sun, 16 Feb 2014 02:04:43 +0000 (+0800)
Subject: ASoC: io: Remove SPI support
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7b80300e749c2865fbfc23870d3b8f3186956fc0;p=deliverable%2Flinux.git

ASoC: io: Remove SPI support

All ASoC CODEC drivers that use SPI have now been converted to use regmap
so we can delete SND_SOC_SPI, preventing any new users being added.

Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9a001472b96a..6197ba0642cc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -342,7 +342,6 @@ extern struct snd_ac97_bus_ops *soc_ac97_ops;
 
 enum snd_soc_control_type {
 	SND_SOC_I2C = 1,
-	SND_SOC_SPI,
 	SND_SOC_REGMAP,
 };
 
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index aa886cca3ecf..3a0d99edf030 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -106,13 +106,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 		break;
 #endif
 
-#if IS_ENABLED(CONFIG_REGMAP_SPI)
-	case SND_SOC_SPI:
-		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
-						      &config);
-		break;
-#endif
-
 	case SND_SOC_REGMAP:
 		/* Device has made its own regmap arrangements */
 		codec->using_regmap = true;