[PATCH] DMA: PL330: add missing header

[PATCH] DMA: PL330: add missing header

[Boojin Kim]

This patch fixup below build error

drivers/dma/pl330.c: In function 'pl330_prep_slave_sg':
drivers/dma/pl330.c:603: error: implicit declaration of function 'for_each_sg'
drivers/dma/pl330.c:603: error: expected ';' before '{' token
drivers/dma/pl330.c:581: warning: unused variable 'flags'
drivers/dma/pl330.c: In function 'pl330_probe':
drivers/dma/pl330.c:720: warning: comparison of distinct pointer types lacks a cast
make[2]: *** [drivers/dma/pl330.o] Error 1

Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
---
 drivers/dma/pl330.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 00eee59..fcad90c 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl330.h>
+#include <linux/scatterlist.h>
 
 #define NR_DEFAULT_DESC	16
 
-- 
1.7.1

Re: [PATCH] DMA: PL330: add missing header

[Koul, Vinod]

On Tue, 2011-08-23 at 14:57 +0900, Boojin Kim wrote:
> This patch fixup below build error
> 
> drivers/dma/pl330.c: In function 'pl330_prep_slave_sg':
> drivers/dma/pl330.c:603: error: implicit declaration of function 'for_each_sg'
> drivers/dma/pl330.c:603: error: expected ';' before '{' token
> drivers/dma/pl330.c:581: warning: unused variable 'flags'
> drivers/dma/pl330.c: In function 'pl330_probe':
> drivers/dma/pl330.c:720: warning: comparison of distinct pointer types lacks a cast
> make[2]: *** [drivers/dma/pl330.o] Error 1
> 
> Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> ---
>  drivers/dma/pl330.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index 00eee59..fcad90c 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -17,6 +17,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/amba/bus.h>
>  #include <linux/amba/pl330.h>
> +#include <linux/scatterlist.h>
>  
>  #define NR_DEFAULT_DESC	16
>  
Where tree is this error reported? scatterlist.h is already added to the
dmaengine.h

-- 
~Vinod

RE: [PATCH] DMA: PL330: add missing header

[Boojin Kim]

Koul, Vinod wrote:
> Sent: Tuesday, August 23, 2011 3:32 PM
> To: Boojin Kim
> Cc: linux-kernel@vger.kernel.org; Kukjin Kim
> Subject: Re: [PATCH] DMA: PL330: add missing header
>
> On Tue, 2011-08-23 at 14:57 +0900, Boojin Kim wrote:
> > This patch fixup below build error
> >
> > drivers/dma/pl330.c: In function 'pl330_prep_slave_sg':
> > drivers/dma/pl330.c:603: error: implicit declaration of function
> 'for_each_sg'
> > drivers/dma/pl330.c:603: error: expected ';' before '{' token
> > drivers/dma/pl330.c:581: warning: unused variable 'flags'
> > drivers/dma/pl330.c: In function 'pl330_probe':
> > drivers/dma/pl330.c:720: warning: comparison of distinct pointer
> types lacks a cast
> > make[2]: *** [drivers/dma/pl330.o] Error 1
> >
> > Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> > ---
> >  drivers/dma/pl330.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> > index 00eee59..fcad90c 100644
> > --- a/drivers/dma/pl330.c
> > +++ b/drivers/dma/pl330.c
> > @@ -17,6 +17,7 @@
> >  #include <linux/interrupt.h>
> >  #include <linux/amba/bus.h>
> >  #include <linux/amba/pl330.h>
> > +#include <linux/scatterlist.h>
> >
> >  #define NR_DEFAULT_DESC	16
> >
> Where tree is this error reported? scatterlist.h is already added to
> the
> dmaengine.h
Oops, I founded it just now in your tree.
OK, please kindly drop this.
As a note, since happens build error with latest mainline v3.1-rc3 so that 
should be merged for v3.1.

Thanks
Boojin kim

>
> --
> ~Vinod

RE: [PATCH] DMA: PL330: add missing header

[Koul, Vinod]

On Tue, 2011-08-23 at 16:19 +0900, Boojin Kim wrote:
> Koul, Vinod wrote:
> > Sent: Tuesday, August 23, 2011 3:32 PM
> > To: Boojin Kim
> > Cc: linux-kernel@vger.kernel.org; Kukjin Kim
> > Subject: Re: [PATCH] DMA: PL330: add missing header
> >
> > On Tue, 2011-08-23 at 14:57 +0900, Boojin Kim wrote:
> > > This patch fixup below build error
> > >
> > > drivers/dma/pl330.c: In function 'pl330_prep_slave_sg':
> > > drivers/dma/pl330.c:603: error: implicit declaration of function
> > 'for_each_sg'
> > > drivers/dma/pl330.c:603: error: expected ';' before '{' token
> > > drivers/dma/pl330.c:581: warning: unused variable 'flags'
> > > drivers/dma/pl330.c: In function 'pl330_probe':
> > > drivers/dma/pl330.c:720: warning: comparison of distinct pointer
> > types lacks a cast
> > > make[2]: *** [drivers/dma/pl330.o] Error 1
> > >
> > > Signed-off-by: Boojin Kim <boojin.kim@samsung.com>
> > > ---
> > >  drivers/dma/pl330.c |    1 +
> > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> > > index 00eee59..fcad90c 100644
> > > --- a/drivers/dma/pl330.c
> > > +++ b/drivers/dma/pl330.c
> > > @@ -17,6 +17,7 @@
> > >  #include <linux/interrupt.h>
> > >  #include <linux/amba/bus.h>
> > >  #include <linux/amba/pl330.h>
> > > +#include <linux/scatterlist.h>
> > >
> > >  #define NR_DEFAULT_DESC	16
> > >
> > Where tree is this error reported? scatterlist.h is already added to
> > the
> > dmaengine.h
> Oops, I founded it just now in your tree.
> OK, please kindly drop this.
> As a note, since happens build error with latest mainline v3.1-rc3 so that 
> should be merged for v3.1.
Russell had fixed compilation of pl330 driver, and was supposed to send
the fix to Linus as part of his fixes. If thats not done I can send it
for next -rc


-- 
~Vinod

Re: [PATCH] DMA: PL330: add missing header

[Russell King - ARM Linux]

On Tue, Aug 23, 2011 at 01:45:42PM +0530, Koul, Vinod wrote:
> Russell had fixed compilation of pl330 driver, and was supposed to send
> the fix to Linus as part of his fixes. If thats not done I can send it
> for next -rc

That was for amba-pl08x.c, not pl330.c

Re: [PATCH] DMA: PL330: add missing header

[Koul, Vinod]

On Tue, 2011-08-23 at 09:23 +0100, Russell King - ARM Linux wrote:
> On Tue, Aug 23, 2011 at 01:45:42PM +0530, Koul, Vinod wrote:
> > Russell had fixed compilation of pl330 driver, and was supposed to send
> > the fix to Linus as part of his fixes. If thats not done I can send it
> > for next -rc
> 
> That was for amba-pl08x.c, not pl330.c
Okay, thanks.
I will send the patch for dmaengine.h to Linus for next -rc

That will resolve this error as well

-- 
~Vinod

Re: [PATCH] DMA: PL330: add missing header

[Russell King - ARM Linux]

On Tue, Aug 23, 2011 at 02:02:47PM +0530, Koul, Vinod wrote:
> On Tue, 2011-08-23 at 09:23 +0100, Russell King - ARM Linux wrote:
> > On Tue, Aug 23, 2011 at 01:45:42PM +0530, Koul, Vinod wrote:
> > > Russell had fixed compilation of pl330 driver, and was supposed to send
> > > the fix to Linus as part of his fixes. If thats not done I can send it
> > > for next -rc
> > 
> > That was for amba-pl08x.c, not pl330.c
> Okay, thanks.
> I will send the patch for dmaengine.h to Linus for next -rc

If you read the original commit, you'll find that scatterlist.h was
explicitly removed from dmaengine.h:

    net: remove mm.h inclusion from netdevice.h

    Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked ma

    To prevent mm.h inclusion via other channels also extract "enum dma_data_dir
    definition into separate header. This tiny piece is what gluing netdevice.h
    via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
    Removal of mm.h from scatterlist.h was tried and was found not feasible
    on most archs, so the link was cutoff earlier.

    Hope people are OK with tiny include file.

    Note, that mm_types.h is still dragged in, but it is a separate story.

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

So adding scatterlist.h back into dmaengine.h may not be the best idea.

Re: [PATCH] DMA: PL330: add missing header

[Koul, Vinod]

On Tue, 2011-08-23 at 10:39 +0100, Russell King - ARM Linux wrote:
> On Tue, Aug 23, 2011 at 02:02:47PM +0530, Koul, Vinod wrote:
> > On Tue, 2011-08-23 at 09:23 +0100, Russell King - ARM Linux wrote:
> > > On Tue, Aug 23, 2011 at 01:45:42PM +0530, Koul, Vinod wrote:
> > > > Russell had fixed compilation of pl330 driver, and was supposed to send
> > > > the fix to Linus as part of his fixes. If thats not done I can send it
> > > > for next -rc
> > > 
> > > That was for amba-pl08x.c, not pl330.c
> > Okay, thanks.
> > I will send the patch for dmaengine.h to Linus for next -rc
> 
> If you read the original commit, you'll find that scatterlist.h was
> explicitly removed from dmaengine.h:
> 
>     net: remove mm.h inclusion from netdevice.h
> 
>     Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked ma
> 
>     To prevent mm.h inclusion via other channels also extract "enum dma_data_dir
>     definition into separate header. This tiny piece is what gluing netdevice.h
>     via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
>     Removal of mm.h from scatterlist.h was tried and was found not feasible
>     on most archs, so the link was cutoff earlier.
> 
>     Hope people are OK with tiny include file.
> 
>     Note, that mm_types.h is still dragged in, but it is a separate story.
> 
>     Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
>     Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> So adding scatterlist.h back into dmaengine.h may not be the best idea.
Yes, looks like that maybe the case. 

It's rather unfortunate that neither Dan nor me were copied on changes
done on dmaengine drivers and headers :(


-- 
~Vinod

Re: [PATCH] DMA: PL330: add missing header

[Koul, Vinod]

On Tue, 2011-08-23 at 16:27 +0530, Koul, Vinod wrote:
> On Tue, 2011-08-23 at 10:39 +0100, Russell King - ARM Linux wrote:
> > On Tue, Aug 23, 2011 at 02:02:47PM +0530, Koul, Vinod wrote:
> > > On Tue, 2011-08-23 at 09:23 +0100, Russell King - ARM Linux wrote:
> > > > On Tue, Aug 23, 2011 at 01:45:42PM +0530, Koul, Vinod wrote:
> > > > > Russell had fixed compilation of pl330 driver, and was supposed to send
> > > > > the fix to Linus as part of his fixes. If thats not done I can send it
> > > > > for next -rc
> > > > 
> > > > That was for amba-pl08x.c, not pl330.c
> > > Okay, thanks.
> > > I will send the patch for dmaengine.h to Linus for next -rc
> > 
> > If you read the original commit, you'll find that scatterlist.h was
> > explicitly removed from dmaengine.h:
> > 
> >     net: remove mm.h inclusion from netdevice.h
> > 
> >     Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked ma
> > 
> >     To prevent mm.h inclusion via other channels also extract "enum dma_data_dir
> >     definition into separate header. This tiny piece is what gluing netdevice.h
> >     via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
> >     Removal of mm.h from scatterlist.h was tried and was found not feasible
> >     on most archs, so the link was cutoff earlier.
> > 
> >     Hope people are OK with tiny include file.
> > 
> >     Note, that mm_types.h is still dragged in, but it is a separate story.
> > 
> >     Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> >     Signed-off-by: David S. Miller <davem@davemloft.net>
> > 
> > So adding scatterlist.h back into dmaengine.h may not be the best idea.
> Yes, looks like that maybe the case. 
> 
> It's rather unfortunate that neither Dan nor me were copied on changes
> done on dmaengine drivers and headers :(
Anyway now we have added the new API of dmaengine_prep_slave_single()
which needs scatterlist.h, any attempt to remove scatterlist wont work.
Either we have to include this in dmaengine.h or any other driver (like
netdevice.h) which includes dmaengine.h


-- 
~Vinod