Re: [GIT PULL] dmaengine update for 2.6.33

[Dan Williams]

On Tue, 2009-12-15 at 22:33 -0700, Williams, Dan J wrote:
> Hi Linus, please pull from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git next
> 
> ...to receive a couple new drivers, coh and ppc440spe-adma (raid offload
> engine), and a collection of fixes from Guennadi.  There are a few more
> shdma fixes pending from Guennadi, but the original driver author wanted
> a bit more time to review / test, so I'm obliging.  These have been in
> linux-next for a few releases.
> 
> Thanks,
> Dan

Looks like you haven't pulled yet, so I am appending one more
straightforward fix from Nicolas:

---
dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'

From: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

Correct a typo error in locking calls.

Cc: <stable@xxxxxxxxxx>
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
---

 drivers/dma/at_hdmac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 7585c41..c558fa1 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -815,7 +815,7 @@ atc_is_tx_complete(struct dma_chan *chan,
 	dev_vdbg(chan2dev(chan), "is_tx_complete: %d (d%d, u%d)\n",
 			cookie, done ? *done : 0, used ? *used : 0);
 
-	spin_lock_bh(atchan->lock);
+	spin_lock_bh(&atchan->lock);
 
 	last_complete = atchan->completed_cookie;
 	last_used = chan->cookie;
@@ -830,7 +830,7 @@ atc_is_tx_complete(struct dma_chan *chan,
 		ret = dma_async_is_complete(cookie, last_complete, last_used);
 	}
 
-	spin_unlock_bh(atchan->lock);
+	spin_unlock_bh(&atchan->lock);
 
 	if (done)
 		*done = last_complete;

---
New combined diffstat is:

 .../powerpc/dts-bindings/4xx/ppc440spe-adma.txt    |   93 +
 arch/arm/mach-u300/include/mach/coh901318.h        |  281 ++
 arch/powerpc/include/asm/async_tx.h                |   47 +
 arch/powerpc/include/asm/dcr-regs.h                |   23 +
 drivers/dma/Kconfig                                |   18 +
 drivers/dma/Makefile                               |    2 +
 drivers/dma/at_hdmac.c                             |    4 +-
 drivers/dma/coh901318.c                            | 1325 ++++++
 drivers/dma/coh901318_lli.c                        |  318 ++
 drivers/dma/coh901318_lli.h                        |  124 +
 drivers/dma/dmatest.c                              |   16 +-
 drivers/dma/iop-adma.c                             |    4 +-
 drivers/dma/ppc4xx/Makefile                        |    1 +
 drivers/dma/ppc4xx/adma.c                          | 5027 ++++++++++++++++++++
 drivers/dma/ppc4xx/adma.h                          |  195 +
 drivers/dma/ppc4xx/dma.h                           |  223 +
 drivers/dma/ppc4xx/xor.h                           |  110 +
 drivers/dma/shdma.c                                |   36 +-
 drivers/dma/shdma.h                                |   14 +-
 include/linux/dmaengine.h                          |    2 +-
 20 files changed, 7830 insertions(+), 33 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/4xx/ppc440spe-adma.txt
 create mode 100644 arch/arm/mach-u300/include/mach/coh901318.h
 create mode 100644 arch/powerpc/include/asm/async_tx.h
 create mode 100644 drivers/dma/coh901318.c
 create mode 100644 drivers/dma/coh901318_lli.c
 create mode 100644 drivers/dma/coh901318_lli.h
 create mode 100644 drivers/dma/ppc4xx/Makefile
 create mode 100644 drivers/dma/ppc4xx/adma.c
 create mode 100644 drivers/dma/ppc4xx/adma.h
 create mode 100644 drivers/dma/ppc4xx/dma.h
 create mode 100644 drivers/dma/ppc4xx/xor.h



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/