From patchwork Wed Aug 8 12:27:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kukjin Kim X-Patchwork-Id: 10580 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4F72D23EB4 for ; Wed, 8 Aug 2012 12:27:43 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 03D08A18595 for ; Wed, 8 Aug 2012 12:27:42 +0000 (UTC) Received: by yenq6 with SMTP id q6so679776yen.11 for ; Wed, 08 Aug 2012 05:27:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:references:in-reply-to:subject:date:message-id :mime-version:content-type:content-transfer-encoding:x-mailer :thread-index:content-language:x-brightmail-tracker:x-tm-as-mml :x-gm-message-state; bh=NP3q0/RfW/2cF4TmeapfBEQ4tfpfnSUUUK8chT9SaO8=; b=L37mAqxpxo6pOixWkjjmmfbVy46VgDIS8JnnufDFE/l2LK30PIfhJuCGwANcQuh2l5 YJ1CVZuoka04AMpTmjcDbQ1eWDiXA9Mbud7RhsKX9Xd+MQXqGbG8L6GUeGDaCCk+vh9s EAoj0H8j/PkQ97C8HwW7H8mJaRIvynLN/p1h+pZ+qUDAGjYR6pFLk0l1x8bwFHCkCkpx 9UMxuHh9wdaAH8cHa20GudptY+/8ReCdyqyU6OQjYo8oBwoPI0oh/SexzSVPYNeyktMf Qad6kBJFnTRvQe3KS3XbyRgtjNOIIh4PEDAD5fKtgdGxAoVkm0ZR+tGT067dO5Pi8/wR PoLQ== Received: by 10.50.95.230 with SMTP id dn6mr760576igb.16.1344428861992; Wed, 08 Aug 2012 05:27:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp604581igc; Wed, 8 Aug 2012 05:27:41 -0700 (PDT) Received: by 10.66.89.6 with SMTP id bk6mr32463642pab.81.1344428861249; Wed, 08 Aug 2012 05:27:41 -0700 (PDT) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by mx.google.com with ESMTP id tf5si30949732pbc.96.2012.08.08.05.27.40; Wed, 08 Aug 2012 05:27:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kgene.kim@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kgene.kim@samsung.com designates 203.254.224.24 as permitted sender) smtp.mail=kgene.kim@samsung.com Received: from epcpsbgm1.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8F005YKRY0A490@mailout1.samsung.com>; Wed, 08 Aug 2012 21:27:39 +0900 (KST) X-AuditID: cbfee61a-b7f616d000004b7e-55-50225b3b2d78 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 16.BA.19326.B3B52205; Wed, 08 Aug 2012 21:27:39 +0900 (KST) Received: from DOKGENEKIM03 ([12.23.119.152]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M8F00GY8RY34X70@mmp2.samsung.com>; Wed, 08 Aug 2012 21:27:39 +0900 (KST) From: Kukjin Kim To: 'Kukjin Kim' , 'Sachin Kamat' Cc: 'Mark Brown' , linux-samsung-soc@vger.kernel.org, alsa-devel@alsa-project.org, patches@linaro.org, sbkim73@samsung.com References: <1344405883-27603-1-git-send-email-sachin.kamat@linaro.org> <20120808110926.GK16861@opensource.wolfsonmicro.com> <0b1401cd755a$552fb9f0$ff8f2dd0$%kim@samsung.com> In-reply-to: Subject: RE: [PATCH] ASoC: Samsung: Fix build error Date: Wed, 08 Aug 2012 21:27:39 +0900 Message-id: <0b2a01cd7561$333e97b0$99bbc710$%kim@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac11WxzXZIyN+yj2TMm1ehMXpqZiegABEdowAABOQKA= Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t9jQV3raKUAg6dNmhZTDn9hsTj5p5fR gcnjzrU9bAGMUVw2Kak5mWWpRfp2CVwZZ1/NYi94pVAxa+5S5gbG15JdjBwcEgImEss6S7oY OYFMMYkL99azdTFycQgJTGeU2PtkJTuE85dR4ua1n0wgVWwCGhKH3z9jB2kWEQiROHrQD6SG WWAxo8S8T10sEA0HmCQWndoH1sApwCOx7k8nM4gtLGAs0fn0FyuIzSKgKvG35xRYnFfAVuLl 7GXsELagxI/J91hAbGYBLYn1O48zQdjyEpvXvGWGuFpd4tFfXZCwiICVxIr19xkhSkQk9r14 xziBUWgWkkmzkEyahWTSLCQtCxhZVjGKphYkFxQnpeca6hUn5haX5qXrJefnbmIEB/UzqR2M KxssDjEKcDAq8fBGJSsGCLEmlhVX5h5ilOBgVhLhfRusFCDEm5JYWZValB9fVJqTWnyIUZqD RUmc19j7q7+QQHpiSWp2ampBahFMlomDU6qB8UBWgsLFk39ctrkVRXVFdr3duG/7uS9TuHtM Vz+WyHdrvfFfLuTQj+3Sr4/8OyG8sPrNlMprLXMWLVD/ePoA51zZ7e3nFXVZSrSSVbNvWGiI 9p8qKG4Jmf2u4nLMFYkvWUFlazjEt65YeHpzUMPHFRyTxX7du3O4II7l+tLchFtCk/WUmtiM HyixFGckGmoxFxUnAgAHsXvqZgIAAA== X-TM-AS-MML: No X-Gm-Message-State: ALoCoQnzsJmuS6BfyGXtwVfQzk+PSPp9k6mY1zSqqQEbpLxza7i7++nqkBAzP4Y6soNO8azzlUQ5 Kukjin Kim wrote: > > Sachin Kamat wrote: > > > > On 8 August 2012 17:08, Kukjin Kim wrote: > > > Sachin Kamat wrote: > > >> > > >> Hi Mark, > > >> > > >> On 8 August 2012 16:39, Mark Brown > > > > >> wrote: > > >> > On Wed, Aug 08, 2012 at 11:34:43AM +0530, Sachin Kamat wrote: > > >> >> Fixes the following build error: > > >> >> In file included from arch/arm/mach-exynos/include/mach/dma.h:24:0, > > >> >> from arch/arm/plat-samsung/include/plat/dma-ops.h:17, > > >> >> from arch/arm/plat-samsung/include/plat/dma.h:128, > > >> >> from sound/soc/samsung/pcm.c:23: > > >> >> arch/arm/plat-samsung/include/plat/dma-pl330.h:106:8: > > >> >> error: redefinition of 'struct > > > s3c2410_dma_client' > > >> >> arch/arm/plat-samsung/include/plat/dma.h:40:8: note: originally > > defined > > >> here > > >> >> make[3]: *** [sound/soc/samsung/pcm.o] Error 1 > > >> > > > >> > Shouldn't this be being fixed in the headers? It looks like they > > >> > reference and disagree with each other on Exynos (my primary > > development > > >> > platform is S3C6410 based so I'd notice if it was a generic Samsung > > >> > issue. > > >> > > > >> > Pasting the error message isn't really that useful unless the fix > is > > >> > obvious, it's better to explain in words what's wrong. > > >> > > >> I had sent the initial patch trying to fix this in the headers and it > > >> worked for exynos4 config. However Kukjin pointed out that the patch > > >> created similar errors with 2410 and 6400 configs. Fixing it further > > >> in the headers did not look quite straight forward as there are many > > >> headers trying to include one another. Hence I felt it is better > > >> handled in the current way. I understand i should have added this > > >> information in the commit message. Below is the link for your > > >> reference that provides the complete discussion. > > >> > > >> http://comments.gmane.org/gmane.linux.kernel.samsung-soc/11274 > > >> > > >> Please let me know your opinion about this. > > >> > > >> > > > I also agree with Mark's opinion and current Sachin's approach cannot > > avoid > > > whole similar build error. > > > > With the current change I did not see any build error with the configs > > (2410, 6400, 64x0 and exyno4) i checked with (after enabling audio). > > Please let me know if you observed any such build error after adding > > this patch. > > > > > > Happens following error with s5pv210_defcofnig (after enabling s5p-sss). > > In file included from arch/arm/mach-s5pv210/include/mach/dma.h:24, > from arch/arm/plat-samsung/include/plat/dma-ops.h:17, > from arch/arm/plat-samsung/include/plat/dma.h:128, > from drivers/crypto/s5p-sss.c:33: > arch/arm/plat-samsung/include/plat/dma-pl330.h:106: error: redefinition of > 'struct s3c2410_dma_client' > make[2]: *** [drivers/crypto/s5p-sss.o] Error 1 > make[1]: *** [drivers/crypto] Error 2 > make[1]: *** Waiting for unfinished jobs.... > make: *** [drivers] Error 2 > make: *** Waiting for unfinished jobs.... > > Actually, is including for s5p64x0, > s5pc100, s5pv210 and exynos or for s3c24xx and s3c64xx. And > the cause of build error you reported is duplicated declaration of > s3c2410_dma_client. So it can happen when and > are included together at the same time... > Of course, following can fix above build error similarly... Acked-by: Kukjin Kim --- --- Hmm...I need to sort this out... Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index bc986f8..6a3e98e 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -30,7 +30,7 @@ #include #include -#include +#include #define _SBF(s, v) ((v) << (s)) #define _BIT(b) _SBF(b, 1)