[alsa-devel] [PATCH] ASoC: multi-component: SAMSUNG: Fix compile error when registering a DAI

[Chanwoo Choi]

Seungwhan Youn wrote:
> On Thu, Jul 22, 2010 at 4:45 PM, Chanwoo Choi <cw00.choi at samsung.com> wrote:
>> Seungwhan Youn wrote:
>>> Hi,
>>>
>>> On Thu, Jul 22, 2010 at 2:14 PM, Chanwoo Choi <cw00.choi at samsung.com> wrote:
>>>> This patch modify some code which register a DAI with ASoC core
>>>> according to modified registration API of DAI.
>>>>
>>>> Signed-off-by: Chanwoo Choi <cw00.choi at samsung.com>
>>>> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
>>>> ---
>>>>  sound/soc/s3c24xx/aquila_wm8994.c |    3 +--
>>>>  sound/soc/s3c24xx/s3c-i2s-v2.c    |    2 +-
>>>>  2 files changed, 2 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/sound/soc/s3c24xx/aquila_wm8994.c b/sound/soc/s3c24xx/aquila_wm8994.c
>>>> index 69c41eb..007ed3a 100644
>>>> --- a/sound/soc/s3c24xx/aquila_wm8994.c
>>>> +++ b/sound/soc/s3c24xx/aquila_wm8994.c
>>>> @@ -268,8 +268,7 @@ static int __init aquila_init(void)
>>>>                return -ENOMEM;
>>>>
>>>>        /* register voice DAI here */
>>>> -       ret = snd_soc_register_dai(&aquila_snd_device->dev,
>>>> -                       0, &voice_dai);
>>>> +       ret = snd_soc_register_dai(&aquila_snd_device->dev, &voice_dai);
>>>>        if (ret)
>>>>                return ret;
>>>>
>>>> diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c
>>>> index f4fbc0e..b3866d5 100644
>>>> --- a/sound/soc/s3c24xx/s3c-i2s-v2.c
>>>> +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
>>>> @@ -750,7 +750,7 @@ int s3c_i2sv2_register_dai(struct device *dev, int id,
>>>>        drv->suspend = s3c2412_i2s_suspend;
>>>>        drv->resume = s3c2412_i2s_resume;
>>>>
>>>> -       return snd_soc_register_dai(dev, id, drv);
>>>> +       return snd_soc_register_dai(dev, drv);
>>> How about s3c64xx-i2s? I think, if this patch fixes all errors in
>> Sorry, I confused your comment.
>> What do you mean "How about s3c64xx-i2s" ?
> 
> Actually 'sound/soc/s3c24xx/s3c64xx-i2s.c' has same error.
> 
> So, If this patch's purpose is to fix compile error, my opinion is
> that this patch fix all the same errors in 'sound/soc/s3c24xx/'.

The 'sound/soc/s3c24xx/s3c64xx-i2s.c' haven't directly called 
'snd_soc_register_dai()' function. 
It is call 's3c_i2sv2_register_dai()' in 'sound/soc/s3c24xx/s3c-i2s-v2.c' 
to register a DAI.

> 
>>> 'sound/soc/s3c24xx',
>>> It'll be more nice than this.
>>