alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ASoC: Samsung: Fix build error
@ 2012-08-08  6:04 Sachin Kamat
  2012-08-08 11:09 ` Mark Brown
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Sachin Kamat @ 2012-08-08  6:04 UTC (permalink / raw)
  To: linux-samsung-soc, alsa-devel
  Cc: kgene.kim, broonie, sachin.kamat, patches, sbkim73

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

Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
---
 sound/soc/samsung/pcm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index b7b2a1f..89b0646 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -20,7 +20,7 @@
 #include <sound/pcm_params.h>
 
 #include <plat/audio.h>
-#include <plat/dma.h>
+#include <mach/dma.h>
 
 #include "dma.h"
 #include "pcm.h"
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08  6:04 [PATCH] ASoC: Samsung: Fix build error Sachin Kamat
@ 2012-08-08 11:09 ` Mark Brown
  2012-08-08 11:33   ` Sachin Kamat
  2012-08-10  6:03 ` Kukjin Kim
  2012-08-10 16:58 ` Mark Brown
  2 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2012-08-08 11:09 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: sbkim73, kgene.kim, alsa-devel, linux-samsung-soc, patches

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.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 11:09 ` Mark Brown
@ 2012-08-08 11:33   ` Sachin Kamat
  2012-08-08 11:38     ` Kukjin Kim
  0 siblings, 1 reply; 11+ messages in thread
From: Sachin Kamat @ 2012-08-08 11:33 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-samsung-soc, alsa-devel, kgene.kim, patches, sbkim73

Hi Mark,

On 8 August 2012 16:39, Mark Brown <broonie@opensource.wolfsonmicro.com> 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.


-- 
With warm regards,
Sachin

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 11:33   ` Sachin Kamat
@ 2012-08-08 11:38     ` Kukjin Kim
  2012-08-08 11:44       ` Sachin Kamat
  0 siblings, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-08-08 11:38 UTC (permalink / raw)
  To: 'Sachin Kamat', 'Mark Brown'
  Cc: sbkim73, alsa-devel, linux-samsung-soc, patches

Sachin Kamat wrote:
> 
> Hi Mark,
> 
> On 8 August 2012 16:39, Mark Brown <broonie@opensource.wolfsonmicro.com>
> 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.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 11:38     ` Kukjin Kim
@ 2012-08-08 11:44       ` Sachin Kamat
  2012-08-08 12:18         ` Kukjin Kim
  2012-08-08 12:27         ` Kukjin Kim
  0 siblings, 2 replies; 11+ messages in thread
From: Sachin Kamat @ 2012-08-08 11:44 UTC (permalink / raw)
  To: Kukjin Kim; +Cc: Mark Brown, linux-samsung-soc, alsa-devel, patches, sbkim73

On 8 August 2012 17:08, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Sachin Kamat wrote:
>>
>> Hi Mark,
>>
>> On 8 August 2012 16:39, Mark Brown <broonie@opensource.wolfsonmicro.com>
>> 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.


>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>



-- 
With warm regards,
Sachin

^ permalink raw reply	[flat|nested] 11+ messages in thread

* RE: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 11:44       ` Sachin Kamat
@ 2012-08-08 12:18         ` Kukjin Kim
  2012-08-08 12:27         ` Kukjin Kim
  1 sibling, 0 replies; 11+ messages in thread
From: Kukjin Kim @ 2012-08-08 12:18 UTC (permalink / raw)
  To: 'Sachin Kamat'
  Cc: 'Mark Brown', linux-samsung-soc, alsa-devel, patches,
	sbkim73

Sachin Kamat wrote:
> 
> On 8 August 2012 17:08, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Sachin Kamat wrote:
> >>
> >> Hi Mark,
> >>
> >> On 8 August 2012 16:39, Mark Brown
> <broonie@opensource.wolfsonmicro.com>
> >> 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, <mach/dma.h> is including <plat/dma-pl330.h> for s5p64x0, s5pc100,
s5pv210 and exynos or <plat/dma.h> for s3c24xx and s3c64xx. And the cause of
build error you reported is duplicated declaration of s3c2410_dma_client. So
it can happen when <plat/dma-pl330.h> and <plat/dma.h> are included together
at the same time...

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* RE: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 11:44       ` Sachin Kamat
  2012-08-08 12:18         ` Kukjin Kim
@ 2012-08-08 12:27         ` Kukjin Kim
  2012-08-10  5:42           ` Kukjin Kim
  1 sibling, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-08-08 12:27 UTC (permalink / raw)
  To: 'Kukjin Kim', 'Sachin Kamat'
  Cc: 'Mark Brown', linux-samsung-soc, alsa-devel, patches,
	sbkim73

Kukjin Kim wrote:
> 
> Sachin Kamat wrote:
> >
> > On 8 August 2012 17:08, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > > Sachin Kamat wrote:
> > >>
> > >> Hi Mark,
> > >>
> > >> On 8 August 2012 16:39, Mark Brown
> > <broonie@opensource.wolfsonmicro.com>
> > >> 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, <mach/dma.h> is including <plat/dma-pl330.h> for s5p64x0,
> s5pc100, s5pv210 and exynos or <plat/dma.h> for s3c24xx and s3c64xx. And
> the cause of build error you reported is duplicated declaration of
> s3c2410_dma_client. So it can happen when <plat/dma-pl330.h> and
> <plat/dma.h> are included together at the same time...
> 
Of course, following can fix above build error similarly...

---
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 <crypto/ctr.h>

 #include <plat/cpu.h>
-#include <plat/dma.h>
+#include <mach/dma.h>

 #define _SBF(s, v)			((v) << (s))
 #define _BIT(b)			_SBF(b, 1)
---

Hmm...I need to sort this out...

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* RE: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08 12:27         ` Kukjin Kim
@ 2012-08-10  5:42           ` Kukjin Kim
  0 siblings, 0 replies; 11+ messages in thread
From: Kukjin Kim @ 2012-08-10  5:42 UTC (permalink / raw)
  To: 'Kukjin Kim', 'Sachin Kamat'
  Cc: 'Mark Brown', linux-samsung-soc, alsa-devel, patches,
	sbkim73, 'Boojin Kim'

Kukjin Kim wrote:
> 
> Kukjin Kim wrote:
> >
> > Sachin Kamat wrote:
> > >
> > > On 8 August 2012 17:08, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > > > Sachin Kamat wrote:
> > > >>
> > > >> Hi Mark,
> > > >>
> > > >> On 8 August 2012 16:39, Mark Brown
> > > <broonie@opensource.wolfsonmicro.com>
> > > >> 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, <mach/dma.h> is including <plat/dma-pl330.h> for s5p64x0,
> > s5pc100, s5pv210 and exynos or <plat/dma.h> for s3c24xx and s3c64xx. And
> > the cause of build error you reported is duplicated declaration of
> > s3c2410_dma_client. So it can happen when <plat/dma-pl330.h> and
> > <plat/dma.h> are included together at the same time...
> >
> Of course, following can fix above build error similarly...
> 
> ---
> 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 <crypto/ctr.h>
> 
>  #include <plat/cpu.h>
> -#include <plat/dma.h>
> +#include <mach/dma.h>
> 
>  #define _SBF(s, v)			((v) << (s))
>  #define _BIT(b)			_SBF(b, 1)
> ---
> 
> Hmm...I need to sort this out...
> 
Mark, I think, Sachin's "[PATCH] ASoC: Samsung: Fix build error" can be a
solution to fix build error because current structure of Samsung DMA is not
simple to fix the problem and support s3c24xx-dma, pl080 and pl330 together.
So only <mach/dma.h> should be included in driver not <plat/dma.h> for
Samsung DMA now. However I know, Boojin Kim (Cc'ed) will clean up the
headers for DMA.

So if you agree, please pick this up into your tree with my ack.

Acked-by: Kukjin Kim <kgene.kim@samsung.com>

Note, if this is ok to you, I will post above fix (drivers/crypto/s5p-sss.c)
to crypto mailing list too.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* RE: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08  6:04 [PATCH] ASoC: Samsung: Fix build error Sachin Kamat
  2012-08-08 11:09 ` Mark Brown
@ 2012-08-10  6:03 ` Kukjin Kim
  2012-08-10  6:17   ` Sachin Kamat
  2012-08-10 16:58 ` Mark Brown
  2 siblings, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-08-10  6:03 UTC (permalink / raw)
  To: 'Sachin Kamat', linux-samsung-soc, alsa-devel
  Cc: broonie, patches, sbkim73

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
> 
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>

BTW, Sachin, do you _really_ need to keep above double signoff with different e-mail?

I think, last one should be removed? Because in the field of author, 'linaro.org' e-mail is used?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-10  6:03 ` Kukjin Kim
@ 2012-08-10  6:17   ` Sachin Kamat
  0 siblings, 0 replies; 11+ messages in thread
From: Sachin Kamat @ 2012-08-10  6:17 UTC (permalink / raw)
  To: Kukjin Kim; +Cc: linux-samsung-soc, alsa-devel, broonie, patches, sbkim73

Hi Kukjin,

On 10 August 2012 11:33, Kukjin Kim <kgene.kim@samsung.com> wrote:
> 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
>>
>> Cc: Kukjin Kim <kgene.kim@samsung.com>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
>
> BTW, Sachin, do you _really_ need to keep above double signoff with different e-mail?
>
> I think, last one should be removed? Because in the field of author, 'linaro.org' e-mail is used?

It is just for a policy i had to keep both. Anyway I don't think it
should be a problem as it is practiced by many developers.
If you _really_ feel it is too annoying, then please feel free to remove one.

>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>



-- 
With warm regards,
Sachin

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ASoC: Samsung: Fix build error
  2012-08-08  6:04 [PATCH] ASoC: Samsung: Fix build error Sachin Kamat
  2012-08-08 11:09 ` Mark Brown
  2012-08-10  6:03 ` Kukjin Kim
@ 2012-08-10 16:58 ` Mark Brown
  2 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2012-08-10 16:58 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-samsung-soc, alsa-devel, kgene.kim, patches, sbkim73

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,

Applied, thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-08-10 16:58 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-08  6:04 [PATCH] ASoC: Samsung: Fix build error Sachin Kamat
2012-08-08 11:09 ` Mark Brown
2012-08-08 11:33   ` Sachin Kamat
2012-08-08 11:38     ` Kukjin Kim
2012-08-08 11:44       ` Sachin Kamat
2012-08-08 12:18         ` Kukjin Kim
2012-08-08 12:27         ` Kukjin Kim
2012-08-10  5:42           ` Kukjin Kim
2012-08-10  6:03 ` Kukjin Kim
2012-08-10  6:17   ` Sachin Kamat
2012-08-10 16:58 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).