Merge branch 'ioat' into dmaengine

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/fsldma.c
Simple merge

diff --cc drivers/dma/ioat/dma.c
Simple merge

diff --cc drivers/dma/ioat/dma.h
Simple merge

diff --cc drivers/dma/ioat/dma_v2.c
Simple merge

diff --cc drivers/dma/ioat/dma_v3.c
index d1adbf3,e2a2395..1cdd22e
--- 1/drivers/dma/ioat/dma_v3.c
--- 2/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@@ -443,12 -408,12 +408,12 @@@ ioat3_tx_status(struct dma_chan *c, dma
  {
        struct ioat2_dma_chan *ioat = to_ioat2_chan(c);
  
 -      if (ioat_is_complete(c, cookie, done, used) == DMA_SUCCESS)
 +      if (ioat_tx_status(c, cookie, txstate) == DMA_SUCCESS)
                return DMA_SUCCESS;
  
-       ioat3_cleanup_poll(ioat);
+       ioat3_cleanup(ioat);
  
 -      return ioat_is_complete(c, cookie, done, used);
 +      return ioat_tx_status(c, cookie, txstate);
  }
  
  static struct dma_async_tx_descriptor *

diff --cc drivers/dma/iop-adma.c
Simple merge

diff --cc drivers/dma/mpc512x_dma.c
Simple merge

diff --cc drivers/dma/mv_xor.c
Simple merge

diff --cc drivers/dma/ppc4xx/adma.c
Simple merge

diff --cc drivers/dma/shdma.c
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
Simple merge

diff --cc drivers/serial/sh-sci.c
Simple merge

diff --cc include/linux/dmaengine.h
index 1745657,cb23497..5204f01
--- 1/include/linux/dmaengine.h
--- 2/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -248,23 -234,67 +249,82 @@@ struct dma_async_tx_descriptor 
        struct dma_async_tx_descriptor *next;
        struct dma_async_tx_descriptor *parent;
        spinlock_t lock;
+ #endif
  };
  
+ #ifdef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH
+ static inline void txd_lock(struct dma_async_tx_descriptor *txd)
+ {
+ }
+ static inline void txd_unlock(struct dma_async_tx_descriptor *txd)
+ {
+ }
+ static inline void txd_chain(struct dma_async_tx_descriptor *txd, struct dma_async_tx_descriptor *next)
+ {
+       BUG();
+ }
+ static inline void txd_clear_parent(struct dma_async_tx_descriptor *txd)
+ {
+ }
+ static inline void txd_clear_next(struct dma_async_tx_descriptor *txd)
+ {
+ }
+ static inline struct dma_async_tx_descriptor *txd_next(struct dma_async_tx_descriptor *txd)
+ {
+       return NULL;
+ }
+ static inline struct dma_async_tx_descriptor *txd_parent(struct dma_async_tx_descriptor *txd)
+ {
+       return NULL;
+ }
+ 
+ #else
+ static inline void txd_lock(struct dma_async_tx_descriptor *txd)
+ {
+       spin_lock_bh(&txd->lock);
+ }
+ static inline void txd_unlock(struct dma_async_tx_descriptor *txd)
+ {
+       spin_unlock_bh(&txd->lock);
+ }
+ static inline void txd_chain(struct dma_async_tx_descriptor *txd, struct dma_async_tx_descriptor *next)
+ {
+       txd->next = next;
+       next->parent = txd;
+ }
+ static inline void txd_clear_parent(struct dma_async_tx_descriptor *txd)
+ {
+       txd->parent = NULL;
+ }
+ static inline void txd_clear_next(struct dma_async_tx_descriptor *txd)
+ {
+       txd->next = NULL;
+ }
+ static inline struct dma_async_tx_descriptor *txd_parent(struct dma_async_tx_descriptor *txd)
+ {
+       return txd->parent;
+ }
+ static inline struct dma_async_tx_descriptor *txd_next(struct dma_async_tx_descriptor *txd)
+ {
+       return txd->next;
+ }
+ #endif
+ 
 +/**
 + * struct dma_tx_state - filled in to report the status of
 + * a transfer.
 + * @last: last completed DMA cookie
 + * @used: last issued DMA cookie (i.e. the one in progress)
 + * @residue: the remaining number of bytes left to transmit
 + *    on the selected transfer for states DMA_IN_PROGRESS and
 + *    DMA_PAUSED if this is implemented in the driver, else 0
 + */
 +struct dma_tx_state {
 +      dma_cookie_t last;
 +      dma_cookie_t used;
 +      u32 residue;
 +};
 +
  /**
   * struct dma_device - info on the entity supplying DMA services
   * @chancnt: how many DMA channels are supported

diff --cc sound/soc/txx9/txx9aclc.c
Simple merge