From patchwork Wed Nov 2 11:04:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 9408933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95FDB601C2 for ; Wed, 2 Nov 2016 11:04:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 909F029B97 for ; Wed, 2 Nov 2016 11:04:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 823AB29BBD; Wed, 2 Nov 2016 11:04:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0781629B97 for ; Wed, 2 Nov 2016 11:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751098AbcKBLEv (ORCPT ); Wed, 2 Nov 2016 07:04:51 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:59839 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750801AbcKBLEu (ORCPT ); Wed, 2 Nov 2016 07:04:50 -0400 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OG001A63HFUNA40@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 02 Nov 2016 20:04:48 +0900 (KST) X-AuditID: cbfee61a-f79926d000005981-ce-5819c850e6e8 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id B9.97.22913.058C9185; Wed, 2 Nov 2016 20:04:48 +0900 (KST) Content-transfer-encoding: 8BIT Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OG0009LXHFS5700@mmp2.samsung.com>; Wed, 02 Nov 2016 20:04:48 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Cc: krzk@kernel.org, m.szyprowski@samsung.com, alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, sbkim73@samsung.com, Sylwester Nawrocki Subject: [PATCH] ASoC: samsung: s3c24xx-i2s.c merge fixup Date: Wed, 02 Nov 2016 12:04:36 +0100 Message-id: <1478084676-30536-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCIsWRmVeSWpSXmKPExsVy+t9jQd2AE5IRBsf2GlhcuXiIyWLqwyds FufPb2C3mHF+H5PF2iN32S0Ov2lntbi44guTA7vHhs9NbB6bVnWyefRtWcXo8XmTXABLlJtN RmpiSmqRQmpecn5KZl66rVJoiJuuhZJCXmJuqq1ShK5vSJCSQlliTimQZ2SABhycA9yDlfTt Etwyln++xFiwjadi5ZcfrA2Me7m6GDk5JARMJNpnTGSEsMUkLtxbzwZiCwnMYpSYeyIDxOYV EJT4MfkeSxcjBwezgLzEkUvZIGFmAXWJSfMWMXcxcgGV/2KUuHJ8OhNIgk3AUKL3aB/YTBGg mbfndDJDNGxmlGhZlQQyR1jAUuLCal2QMIuAqsSNY8dYIFa5SXSvuMgCcY6cxMljk1knMPLN QnLFLIQrZiG5YgEj8ypGidSC5ILipPRcw7zUcr3ixNzi0rx0veT83E2M4Bh5JrWD8eAu90OM AhyMSjy8E5ZIRAixJpYVV+YeYpTgYFYS4V11WDJCiDclsbIqtSg/vqg0J7X4EKMp0I0TmaVE k/OB8ZtXEm9oYm5ibmxgYW5paWKkJM7bOPtZuJBAemJJanZqakFqEUwfEwenVANjIsdbpqQ/ N7cKbfwusO5yEPP8J448tlkzFidXiWs02RRamIh/eK+29O8tI617GzxCJXf//HN58n+m8Gam TIfV9z0zJk5U1+e0rDHZn+TUnmqpVPhpdZ+X1Ol+0fKJsxhk9NmMk9uPyT3dpxQ1+2fjNhOH 2evUf0c9n+O4/GjoHnehvk9MPrOUWIozEg21mIuKEwHLmlP7pwIAAA== X-MTR: 20000000000000000@CPGS Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes a build error as below which appeared after merging branch fix/samsung and also proper error messages are restored. sound/soc/samsung/s3c24xx-i2s.c: In function ‘s3c24xx_iis_dev_probe’: sound/soc/samsung/s3c24xx-i2s.c:444:8: error: ‘pdata’ undeclared (first use in this function) sound/soc/samsung/s3c24xx-i2s.c:444:8: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Sylwester Nawrocki --- sound/soc/samsung/s3c24xx-i2s.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 3b4bef9..bc5809a 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -440,18 +440,17 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO; s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO; - ret = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter, + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) { - dev_err(&pdev->dev, "Failed to register the DAI\n"); + dev_err(&pdev->dev, "Failed to register the DMA: %d\n", ret); return ret; } ret = devm_snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); if (ret) - pr_err("failed to register the dai\n"); + dev_err(&pdev->dev, "Failed to register the DAI\n"); return ret; }