From: Mark Brown broonie@linaro.org

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 --- include/sound/soc.h | 1 - sound/soc/soc-io.c | 7 ------- 2 files changed, 8 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h index 21d025e..21038e0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -356,7 +356,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 aa886cc..3a0d99e 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;