lkml.org 
[lkml]   [2010]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] ASoC: Fix compile error for smartq_wm8987.c
    From
    Date
    Fix below compile error:

    CC sound/soc/samsung/smartq_wm8987.o
    sound/soc/samsung/smartq_wm8987.c: In function 'smartq_hifi_hw_params':
    sound/soc/samsung/smartq_wm8987.c:42: error: 'struct snd_soc_pcm_runtime' has no member named 'dai'
    sound/soc/samsung/smartq_wm8987.c:43: error: 'struct snd_soc_pcm_runtime' has no member named 'dai'
    sound/soc/samsung/smartq_wm8987.c: In function 'smartq_wm8987_init':
    sound/soc/samsung/smartq_wm8987.c:192: warning: passing argument 1 of 'snd_soc_jack_new' from incompatible pointer type
    sound/soc/samsung/smartq_wm8987.c: At top level:
    sound/soc/samsung/smartq_wm8987.c:216: warning: initialization from incompatible pointer type
    make[3]: *** [sound/soc/samsung/smartq_wm8987.o] Error 1
    make[2]: *** [sound/soc/samsung] Error 2
    make[1]: *** [sound/soc] Error 2
    make: *** [sound] Error 2

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    sound/soc/samsung/smartq_wm8987.c | 9 +++++----
    1 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
    index d6a340b8..0a46fa8 100644
    --- a/sound/soc/samsung/smartq_wm8987.c
    +++ b/sound/soc/samsung/smartq_wm8987.c
    @@ -39,8 +39,8 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
    struct snd_pcm_hw_params *params)
    {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
    - struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
    - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
    + struct snd_soc_dai *codec_dai = rtd->codec_dai;
    + struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
    unsigned int clk = 0;
    int ret;

    @@ -153,8 +153,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
    {"LINPUT2", NULL, "Mic Bias"},
    };

    -static int smartq_wm8987_init(struct snd_soc_codec *codec)
    +static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
    {
    + struct snd_soc_codec *codec = rtd->codec;
    struct snd_soc_dapm_context *dapm = &codec->dapm;
    int err = 0;

    @@ -188,7 +189,7 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec)
    return err;

    /* Headphone jack detection */
    - err = snd_soc_jack_new(&snd_soc_smartq, "Headphone Jack",
    + err = snd_soc_jack_new(codec, "Headphone Jack",
    SND_JACK_HEADPHONE, &smartq_jack);
    if (err)
    return err;
    --
    1.7.2




    \
     
     \ /
      Last update: 2010-11-25 06:41    [W:0.021 / U:59.952 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site