Patchwork dmaengine: pl330: add missing include of scatterlist.h

login
register
mail settings
Submitter Rob Herring
Date Aug. 8, 2011, 7:14 p.m.
Message ID <1312830866-2932-1-git-send-email-robherring2@gmail.com>
Download mbox | patch
Permalink /patch/109078/
State New
Headers show

Comments

Rob Herring - Aug. 8, 2011, 7:14 p.m.
From: Rob Herring <rob.herring@calxeda.com>

scatterlist.h was getting implicitly included and now is not which
causes this compile error:

drivers/dma/pl330.c: In function ‘pl330_prep_slave_sg’:
drivers/dma/pl330.c:603:2: error: implicit declaration of function
‘for_each_sg’

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Vinod Koul <vkoul@infradead.org>
---
 drivers/dma/pl330.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Jassi Brar - Aug. 8, 2011, 7:29 p.m.
On Tue, Aug 9, 2011 at 12:44 AM, Rob Herring <robherring2@gmail.com> wrote:
> From: Rob Herring <rob.herring@calxeda.com>
>
> scatterlist.h was getting implicitly included and now is not which
> causes this compile error:
>
> drivers/dma/pl330.c: In function ‘pl330_prep_slave_sg’:
> drivers/dma/pl330.c:603:2: error: implicit declaration of function
> ‘for_each_sg’
>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> Cc: Jassi Brar <jassisinghbrar@gmail.com>
> Cc: Vinod Koul <vkoul@infradead.org>

Acked-by: Jassi Brar <jassisinghbrar@gmail.com>

thnx
Koul, Vinod - Aug. 9, 2011, 4:36 a.m.
On Tue, 2011-08-09 at 00:59 +0530, Jassi Brar wrote:
> On Tue, Aug 9, 2011 at 12:44 AM, Rob Herring <robherring2@gmail.com> wrote:
> > From: Rob Herring <rob.herring@calxeda.com>
> >
> > scatterlist.h was getting implicitly included and now is not which
> > causes this compile error:
> >
> > drivers/dma/pl330.c: In function ‘pl330_prep_slave_sg’:
> > drivers/dma/pl330.c:603:2: error: implicit declaration of function
> > ‘for_each_sg’
> >
> > Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> > Cc: Jassi Brar <jassisinghbrar@gmail.com>
> > Cc: Vinod Koul <vkoul@infradead.org>
> 
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
> 
> thnx

Commit 90b44f8 introduces dmaengine_prep_slave_single API which adds
scatterlist.h in dmaengine.h, since you already include dmaengine.h this
patch shouldn't be required

Patch

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 00eee59..4e2ccde 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -15,6 +15,7 @@ 
 #include <linux/module.h>
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
+#include <linux/scatterlist.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl330.h>