From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chanwoo Choi Subject: [PATCH] ASoC: multi-component: SAMSUNG: Fix compile error when registering a DAI Date: Thu, 22 Jul 2010 14:14:11 +0900 Message-ID: <4C47D3A3.9000102@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by alsa0.perex.cz (Postfix) with ESMTP id 40EE71037FB for ; Thu, 22 Jul 2010 07:14:15 +0200 (CEST) Received: from epmmp1. (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0L5Y00AS417OB260@mailout3.samsung.com> for alsa-devel@alsa-project.org; Thu, 22 Jul 2010 14:14:12 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net (unknown [165.213.149.150]) by mmp1.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTPA id <0L5Y002AX17OL9B0@mmp1.samsung.com> for alsa-devel@alsa-project.org; Thu, 22 Jul 2010 14:14:12 +0900 (KST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org Cc: Kyungmin Park , Mark Brown , Joonyoung Shim , Liam Girdwood List-Id: alsa-devel@alsa-project.org This patch modify some code which register a DAI with ASoC core according to modified registration API of DAI. Signed-off-by: Chanwoo Choi Signed-off-by: Kyungmin Park --- 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); } EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); -- 1.6.3.3