]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: Remove unused "control_data" field of struct wm9081_priv
authorAxel Lin <axel.lin@gmail.com>
Tue, 27 Sep 2011 12:44:13 +0000 (20:44 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Sep 2011 18:53:38 +0000 (19:53 +0100)
The control_data field is used to initialize the codec's control_data field,
but since this is also done by the snd-soc-cache core, the redundant
assignment can be removed and the field can be dropped.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm9081.c

index f32ab1ee964754b83e609983131973ad729f3cd3..b2d34483a6a41c50c043956bac1da49d8abb83f8 100644 (file)
@@ -157,7 +157,6 @@ static struct {
 
 struct wm9081_priv {
        enum snd_soc_control_type control_type;
-       void *control_data;
        int sysclk_source;
        int mclk_rate;
        int sysclk_rate;
@@ -1213,7 +1212,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)
        int ret;
        u16 reg;
 
-       codec->control_data = wm9081->control_data;
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1330,7 +1328,6 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
 
        i2c_set_clientdata(i2c, wm9081);
        wm9081->control_type = SND_SOC_I2C;
-       wm9081->control_data = i2c;
 
        if (dev_get_platdata(&i2c->dev))
                memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev),