ASoC: Remove unneeded control_data management from Wolfson drivers

Now soc-cache.c can figure out the I2C and SPI control data from the
device for the CODEC we don't need to manually assign it in drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 1c623de4a4cd6cd119fcd2ebd427d1b70f177cd9..d00da2001a12cbec3abf2039bb83872b710a9a1a 100644 (file)
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -60,7 +60,6 @@ static const u16 wm8510_reg[WM8510_CACHEREGNUM] = {
 /* codec private data */
 struct wm8510_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
 };
 
 static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" };
@@ -561,7 +560,6 @@ static int wm8510_probe(struct snd_soc_codec *codec)
        struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
        int ret;
 
-       codec->control_data = wm8510->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9,  wm8510->control_type);
        if (ret < 0) {
                printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret);
@@ -611,7 +609,6 @@ static int __devinit wm8510_spi_probe(struct spi_device *spi)
        if (wm8510 == NULL)
                return -ENOMEM;
 
-       wm8510->control_data = spi;
        wm8510->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8510);
 
@@ -651,7 +648,6 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8510);
-       wm8510->control_data = i2c;
        wm8510->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 58d411b6faaf46029baf984fad2732c70eb7e5bf..712ef7c76f90bbde579229ea85716dd14f7acb10 100644 (file)
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -41,7 +41,6 @@ static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8523_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[WM8523_REGISTER_COUNT];
        struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES];
        unsigned int sysclk;
@@ -419,7 +418,6 @@ static int wm8523_probe(struct snd_soc_codec *codec)
        int ret, i;
 
        codec->hw_write = (hw_write_t)i2c_master_send;
-       codec->control_data = wm8523->control_data;
        wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0];
        wm8523->rate_constraint.count =
                ARRAY_SIZE(wm8523->rate_constraint_list);
@@ -528,7 +526,6 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8523);
-       wm8523->control_data = i2c;
        wm8523->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index cae58941a32f3021b0096ef8bd3e8b75316d1104..39ad46c41e8aaf370ac3f0113bc4f0f17c2d9fa2 100644 (file)
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -200,7 +200,6 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8580_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES];
        u16 reg_cache[WM8580_MAX_REGISTER + 1];
        struct pll_state a;
@@ -778,7 +777,6 @@ static int wm8580_probe(struct snd_soc_codec *codec)
        struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
        int ret = 0,i;
 
-       codec->control_data = wm8580->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8580->control_type);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -858,7 +856,6 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8580);
-       wm8580->control_data = i2c;
        wm8580->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 8d942b3b111fb0c2405a87dc84929d8acac15504..f8d9c60e7fad06d65ca69ed28d68eb4d78393f56 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -34,7 +34,6 @@
 /* codec private data */
 struct wm8711_priv {
        enum snd_soc_control_type bus_type;
-       void *control_data;
        u16 reg_cache[WM8711_CACHEREGNUM];
        unsigned int sysclk;
 };
@@ -378,7 +377,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
        int ret, reg;
 
-       codec->control_data = wm8711->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -436,7 +434,6 @@ static int __devinit wm8711_spi_probe(struct spi_device *spi)
                return -ENOMEM;
 
        spi_set_drvdata(spi, wm8711);
-       wm8711->control_data = spi;
        wm8711->bus_type = SND_SOC_SPI;
 
        ret = snd_soc_register_codec(&spi->dev,
@@ -476,7 +473,6 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
 
        i2c_set_clientdata(client, wm8711);
-       wm8711->control_data = client;
        wm8711->bus_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&client->dev,

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index ae2292444783f0a502af51ccb56ba53e20dd075e..5e5a1625194c453841ecd2ce431064521595c8bf 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -45,7 +45,6 @@ static const u16 wm8728_reg_defaults[] = {
 /* codec private data */
 struct wm8728_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
 };
 
 static const DECLARE_TLV_DB_SCALE(wm8728_tlv, -12750, 50, 1);
@@ -244,7 +243,6 @@ static int wm8728_probe(struct snd_soc_codec *codec)
        struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec);
        int ret;
 
-       codec->control_data = wm8728->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8728->control_type);
        if (ret < 0) {
                printk(KERN_ERR "wm8728: failed to configure cache I/O: %d\n",
@@ -289,7 +287,6 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi)
        if (wm8728 == NULL)
                return -ENOMEM;
 
-       wm8728->control_data = spi;
        wm8728->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8728);
 
@@ -330,7 +327,6 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8728);
-       wm8728->control_data = i2c;
        wm8728->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 7da360ee1fee5364103f646db1b76717d767b05a..19844fc8cb1dfd8edf39e929853b573e68d25298 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -43,7 +43,6 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8731_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
        u16 reg_cache[WM8731_CACHEREGNUM];
        unsigned int sysclk;
@@ -463,7 +462,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)
        int ret = 0, i;
 
        codec->bias_level = SND_SOC_BIAS_OFF,
-       codec->control_data = wm8731->control_data;
 
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type);
        if (ret < 0) {
@@ -557,7 +555,6 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi)
        if (wm8731 == NULL)
                return -ENOMEM;
 
-       wm8731->control_data = spi;
        wm8731->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8731);
 
@@ -598,7 +595,6 @@ static __devinit int wm8731_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8731);
-       wm8731->control_data = i2c;
        wm8731->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 0c6d59e4d226c8956f3a49fe1252ea77af97a7a9..782fe539662b9d840dde6543d484a25c50e100f1 100644 (file)
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -41,7 +41,6 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8741_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[WM8741_REGISTER_COUNT];
        struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES];
        unsigned int sysclk;
@@ -347,7 +346,6 @@ static int wm8741_probe(struct snd_soc_codec *codec)
        struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);
        int ret = 0;
 
-       codec->control_data = wm8741->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -415,7 +413,6 @@ static int wm8741_i2c_probe(struct i2c_client *i2c,
        }
 
        i2c_set_clientdata(i2c, wm8741);
-       wm8741->control_data = i2c;
        wm8741->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 89863a5bc83072221aafe520dfeac8338d9d3ff4..92d4b2aef93b54a4d31af6e6f85cecd80bda4e9f 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -53,7 +53,6 @@ static const u16 wm8750_reg[] = {
 struct wm8750_priv {
        unsigned int sysclk;
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[ARRAY_SIZE(wm8750_reg)];
 };
 
@@ -697,7 +696,6 @@ static int wm8750_probe(struct snd_soc_codec *codec)
        struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec);
        int reg, ret;
 
-       codec->control_data = wm8750->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8750->control_type);
        if (ret < 0) {
                printk(KERN_ERR "wm8750: failed to set cache I/O: %d\n", ret);
@@ -764,7 +762,6 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)
        if (wm8750 == NULL)
                return -ENOMEM;
 
-       wm8750->control_data = spi;
        wm8750->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8750);
 
@@ -805,7 +802,6 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8750);
-       wm8750->control_data = i2c;
        wm8750->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 976e408b361622aaad758a42b01a04a4bd23d5d1..484423248c2633176431b39e2f50257c96c06166 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -86,7 +86,6 @@ static const u16 wm8753_reg[] = {
 /* codec private data */
 struct wm8753_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        unsigned int sysclk;
        unsigned int pcmclk;
        u16 reg_cache[ARRAY_SIZE(wm8753_reg)];
@@ -1551,8 +1550,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
        struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
        int ret = 0, reg;
 
-       codec->bias_level = SND_SOC_BIAS_OFF,
-       codec->control_data = wm8753->control_data;
+       codec->bias_level = SND_SOC_BIAS_OFF;
        INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
 
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type);
@@ -1637,7 +1635,6 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
        if (wm8753 == NULL)
                return -ENOMEM;
 
-       wm8753->control_data = spi;
        wm8753->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8753);
 
@@ -1678,7 +1675,6 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8753);
-       wm8753->control_data = i2c;
        wm8753->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 51a2d265d40ece37da36bd1d854515aaf7916a18..053030679c1a9f37c40b7065ae127e2ae1984e05 100644 (file)
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -34,7 +34,6 @@
 /* codec private data */
 struct wm8776_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[WM8776_CACHEREGNUM];
        int sysclk[2];
 };
@@ -415,7 +414,6 @@ static int wm8776_probe(struct snd_soc_codec *codec)
        struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
        int ret = 0;
 
-       codec->control_data = wm8776->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -472,7 +470,6 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
        if (wm8776 == NULL)
                return -ENOMEM;
 
-       wm8776->control_data = spi;
        wm8776->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8776);
 
@@ -513,7 +510,6 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8776);
-       wm8776->control_data = i2c;
        wm8776->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 33c3b57f3f664d472b72ba1f3acc60c0822870b0..1378aab5ca7562b6feaead8f87aff0c884c3d6aa 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -140,7 +140,6 @@
 
 struct wm8900_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[WM8900_MAXREG];
 
        u32 fll_in; /* FLL input frequency */
@@ -1189,7 +1188,6 @@ static int wm8900_probe(struct snd_soc_codec *codec)
        struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec);
        int ret = 0, reg;
 
-       codec->control_data = wm8900->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8900->control_type);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1273,7 +1271,6 @@ static int __devinit wm8900_spi_probe(struct spi_device *spi)
        if (wm8900 == NULL)
                return -ENOMEM;
 
-       wm8900->control_data = spi;
        wm8900->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8900);
 
@@ -1314,7 +1311,6 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8900);
-       wm8900->control_data = i2c;
        wm8900->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index f5d73ed72cbd2a3bc9319385249c36ac7a8a3b37..622b60238a824e084099b3f290dc0dda6ebf6767 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -217,7 +217,6 @@ struct wm8903_priv {
        u16 reg_cache[ARRAY_SIZE(wm8903_reg_defaults)];
 
        int sysclk;
-       struct i2c_client *control_data;
        int irq;
 
        /* Reference counts */
@@ -1639,7 +1638,6 @@ static int wm8903_probe(struct snd_soc_codec *codec)
        u16 val;
 
        init_completion(&wm8903->wseq);
-       codec->control_data = wm8903->control_data;
 
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
        if (ret != 0) {
@@ -1779,7 +1777,6 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8903);
-       wm8903->control_data = i2c;
        wm8903->irq = i2c->irq;
 
        ret = snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index a5a9f8ef577190f9a1068182b90ed6c9506b5efb..f89ad6c9a80b9162e7040ea6fe76b434c9f743f1 100644 (file)
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -41,7 +41,6 @@ static const char *wm8955_supply_names[WM8955_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8955_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
 
        u16 reg_cache[WM8955_MAX_REGISTER + 1];
 
@@ -904,7 +903,6 @@ static int wm8955_probe(struct snd_soc_codec *codec)
        struct wm8955_pdata *pdata = dev_get_platdata(codec->dev);
        int ret, i;
 
-       codec->control_data = wm8955->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8955->control_type);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1004,7 +1002,6 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8955);
-       wm8955->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8955, &wm8955_dai, 1);

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 5ebe2c04e5cfe3084c14d1125b53a25916d21f5e..fa36a62972f88135a16524b28853e1ca27cfde0b 100644 (file)
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -289,7 +289,6 @@ static u16 wm8961_reg_defaults[] = {
 
 struct wm8961_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        int sysclk;
        u16 reg_cache[WM8961_MAX_REGISTER];
 };
@@ -964,7 +963,6 @@ static int wm8961_probe(struct snd_soc_codec *codec)
        int ret = 0;
        u16 reg;
 
-       codec->control_data = wm8961->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1096,7 +1094,6 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8961);
-       wm8961->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8961, &wm8961_dai, 1);

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index ad2692afbb315bc85747e6f544e861d7c27acc07..1d460735c4d32d9425e1d480e08e8a3831b72e0a 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -39,7 +39,6 @@ static struct workqueue_struct *wm8971_workq = NULL;
 /* codec private data */
 struct wm8971_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        unsigned int sysclk;
 };
 
@@ -642,7 +641,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
 
        pr_info("WM8971 Audio Codec %s", WM8971_VERSION);
 
-       codec->control_data = wm8971->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8971->control_type);
        if (ret < 0) {
                printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret);
@@ -725,7 +723,6 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8971);
-       wm8971->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8971, &wm8971_dai, 1);

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 52f631c62e297a4bf0a8105c47cbb988cd3f0fc2..e61728b7339fda9d1f64a367f4811f694d944256 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -52,7 +52,6 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
 
 struct wm8974_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        u16 reg_cache[WM8974_CACHEREGNUM];
 };
 
@@ -611,7 +610,6 @@ static int wm8974_probe(struct snd_soc_codec *codec)
        struct wm8974_priv *wm8974 = snd_soc_codec_get_drvdata(codec);
        int ret = 0;
 
-       codec->control_data = wm8974->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -662,7 +660,6 @@ static __devinit int wm8974_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8974);
-       wm8974->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8974, &wm8974_dai, 1);

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index ecbffcea71dbbfafb4b8303e182ebe468e1a19fe..d070a58e4f8ed5b8ab73aa2c17be1967e24348d8 100644 (file)
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -53,7 +53,6 @@ static const u16 wm8988_reg[] = {
 struct wm8988_priv {
        unsigned int sysclk;
        enum snd_soc_control_type control_type;
-       void *control_data;
        struct snd_pcm_hw_constraint_list *sysclk_constraints;
        u16 reg_cache[WM8988_NUM_REG];
 };
@@ -763,7 +762,6 @@ static int wm8988_probe(struct snd_soc_codec *codec)
        int ret = 0;
        u16 reg;
 
-       codec->control_data = wm8988->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8988->control_type);
        if (ret < 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -826,7 +824,6 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
        if (wm8988 == NULL)
                return -ENOMEM;
 
-       wm8988->control_data = spi;
        wm8988->control_type = SND_SOC_SPI;
        spi_set_drvdata(spi, wm8988);
 
@@ -867,7 +864,6 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8988);
-       wm8988->control_data = i2c;
        wm8988->control_type = SND_SOC_I2C;
 
        ret =  snd_soc_register_codec(&i2c->dev,

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index b252433829663db482396d4032f89afe764e9c7f..0ffecbd1e33bc25db7f9bd583f9c4f9d0ed3231f 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -33,7 +33,6 @@
 /* codec private data */
 struct wm8990_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        unsigned int sysclk;
        unsigned int pcmclk;
 };
@@ -1343,11 +1342,9 @@ static int wm8990_resume(struct snd_soc_codec *codec)
  */
 static int wm8990_probe(struct snd_soc_codec *codec)
 {
-       struct wm8990_priv *wm8990 = snd_soc_codec_get_drvdata(codec);
        int ret;
        u16 reg;
 
-       codec->control_data = wm8990->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
        if (ret < 0) {
                printk(KERN_ERR "wm8990: failed to set cache I/O: %d\n", ret);
@@ -1410,7 +1407,6 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8990);
-       wm8990->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8990, &wm8990_dai, 1);

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 1d9e1837a2dfcb9f72932086e115f4a5f80a4d92..a3fd6b935804406deb93c352ee5432ba899d9c57 100644 (file)
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -230,7 +230,6 @@ struct wm8993_priv {
        struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES];
        struct wm8993_platform_data pdata;
        enum snd_soc_control_type control_type;
-       void *control_data;
        int master;
        int sysclk_source;
        int tdm_slots;
@@ -1425,7 +1424,6 @@ static int wm8993_probe(struct snd_soc_codec *codec)
        struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        int ret, i, val;
 
-       codec->control_data = wm8993->control_data;
        wm8993->hubs_data.hp_startup_mode = 1;
        wm8993->hubs_data.dcs_codes = -2;
 
@@ -1606,7 +1604,6 @@ static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, wm8993);
-       wm8993->control_data = i2c;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8993, &wm8993_dai, 1);