lkml.org 
[lkml]   [2011]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/6] ASoC: Remove unused "control_data" field of struct wm8960_priv
    From
    Date
    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>
    ---
    sound/soc/codecs/wm8960.c | 3 ---
    1 files changed, 0 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
    index 4393394..831c20f 100644
    --- a/sound/soc/codecs/wm8960.c
    +++ b/sound/soc/codecs/wm8960.c
    @@ -72,7 +72,6 @@ static const u16 wm8960_reg[WM8960_CACHEREGNUM] = {

    struct wm8960_priv {
    enum snd_soc_control_type control_type;
    - void *control_data;
    int (*set_bias_level)(struct snd_soc_codec *,
    enum snd_soc_bias_level level);
    struct snd_soc_dapm_widget *lout1;
    @@ -925,7 +924,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
    u16 reg;

    wm8960->set_bias_level = wm8960_set_bias_level_out3;
    - codec->control_data = wm8960->control_data;

    if (!pdata) {
    dev_warn(codec->dev, "No platform data supplied\n");
    @@ -1015,7 +1013,6 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,

    i2c_set_clientdata(i2c, wm8960);
    wm8960->control_type = SND_SOC_I2C;
    - wm8960->control_data = i2c;

    ret = snd_soc_register_codec(&i2c->dev,
    &soc_codec_dev_wm8960, &wm8960_dai, 1);
    --
    1.7.4.1




    \
     
     \ /
      Last update: 2011-09-27 14:45    [W:0.022 / U:2.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site