From 34630afe4356b06c266f717d3b5fea268490a939 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 6 Jun 2011 13:38:39 +0200 Subject: [PATCH] --- yaml --- r: 257504 b: refs/heads/master c: 583eadab21779c4301f01a11bf3d0d49b643aa80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad1836.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b6efc0eae11f..08a569c022b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 874ce77bc3027ce08e3ee35c3edad3b254e496d1 +refs/heads/master: 583eadab21779c4301f01a11bf3d0d49b643aa80 diff --git a/trunk/sound/soc/codecs/ad1836.c b/trunk/sound/soc/codecs/ad1836.c index ad4c06760440..78d38cb62c05 100644 --- a/trunk/sound/soc/codecs/ad1836.c +++ b/trunk/sound/soc/codecs/ad1836.c @@ -38,8 +38,6 @@ enum ad1836_type { /* codec private data */ struct ad1836_priv { - enum snd_soc_control_type control_type; - void *control_data; enum ad1836_type type; }; @@ -257,7 +255,6 @@ static int ad1836_probe(struct snd_soc_codec *codec) num_dacs = ad183x_dais[ad1836->type].playback.channels_max / 2; num_adcs = ad183x_dais[ad1836->type].capture.channels_max / 2; - codec->control_data = ad1836->control_data; ret = snd_soc_codec_set_cache_io(codec, 4, 12, SND_SOC_SPI); if (ret < 0) { dev_err(codec->dev, "failed to set cache I/O: %d\n", @@ -350,8 +347,6 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) ad1836->type = spi_get_device_id(spi)->driver_data; spi_set_drvdata(spi, ad1836); - ad1836->control_data = spi; - ad1836->control_type = SND_SOC_SPI; ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1);