MIPS: Alchemy: remove dbdma compat macros

Remove dbdma compat macros, move remaining users over to default
queueing functions and -flags.

(Queueing function signature has changed in order to give
 a build failure instead of silent functional changes due
 to the no longer implicitly specified DDMA_FLAGS_IE flag)

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 15 insertions, 16 deletions

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 87cef0c440ad..377412e1d32b 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -56,8 +56,8 @@ static inline void auide_insw(unsigned long port, void *addr, u32 count)
         chan_tab_t *ctp;
         au1x_ddma_desc_t *dp;
 
-        if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, 
-                           DDMA_FLAGS_NOIE)) {
+        if (!au1xxx_dbdma_put_dest(ahwif->rx_chan, (void*)addr,
+                                   count << 1, DDMA_FLAGS_NOIE)) {
                 printk(KERN_ERR "%s failed %d\n", __func__, __LINE__);
                 return;
         }
@@ -74,8 +74,8 @@ static inline void auide_outsw(unsigned long port, void *addr, u32 count)
         chan_tab_t *ctp;
         au1x_ddma_desc_t *dp;
 
-        if(!put_source_flags(ahwif->tx_chan, (void*)addr,
-                             count << 1, DDMA_FLAGS_NOIE)) {
+        if (!au1xxx_dbdma_put_source(ahwif->tx_chan, (void*)addr,
+                                     count << 1, DDMA_FLAGS_NOIE)) {
                 printk(KERN_ERR "%s failed %d\n", __func__, __LINE__);
                 return;
         }
@@ -246,17 +246,14 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                                 flags = DDMA_FLAGS_NOIE;
 
                         if (iswrite) {
-                                if(!put_source_flags(ahwif->tx_chan, 
-                                                     (void*) sg_virt(sg),
-                                                     tc, flags)) { 
+                                if (!au1xxx_dbdma_put_source(ahwif->tx_chan,
+                                        (void *)sg_virt(sg), tc, flags)) {
                                         printk(KERN_ERR "%s failed %d\n", 
                                                __func__, __LINE__);
                                 }
-                        } else 
-                        {
-                                if(!put_dest_flags(ahwif->rx_chan, 
-                                                   (void*) sg_virt(sg),
-                                                   tc, flags)) { 
+                        } else  {
+                                if (!au1xxx_dbdma_put_dest(ahwif->rx_chan,
+                                        (void *)sg_virt(sg), tc, flags)) {
                                         printk(KERN_ERR "%s failed %d\n", 
                                                __func__, __LINE__);
                                 }
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index d3f55615c099..d295dc5e4f6b 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -650,10 +650,10 @@ static int au1xmmc_prepare_data(struct au1xmmc_host *host,
                                 flags = DDMA_FLAGS_IE;
 
                         if (host->flags & HOST_F_XMIT) {
-                                ret = au1xxx_dbdma_put_source_flags(channel,
+                                ret = au1xxx_dbdma_put_source(channel,
                                         (void *)sg_virt(sg), len, flags);
                         } else {
-                                ret = au1xxx_dbdma_put_dest_flags(channel,
+                                ret = au1xxx_dbdma_put_dest(channel,
                                         (void *)sg_virt(sg), len, flags);
                         }
 
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index cfd5ff9508fa..22f7d7294787 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -412,11 +412,13 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
         }
 
         /* put buffers on the ring */
-        res = au1xxx_dbdma_put_dest(hw->dma_rx_ch, hw->rx, t->len);
+        res = au1xxx_dbdma_put_dest(hw->dma_rx_ch, hw->rx,
+                                    t->len, DDMA_FLAGS_IE);
         if (!res)
                 dev_err(hw->dev, "rx dma put dest error\n");
 
-        res = au1xxx_dbdma_put_source(hw->dma_tx_ch, (void *)hw->tx, t->len);
+        res = au1xxx_dbdma_put_source(hw->dma_tx_ch, (void *)hw->tx,
+                                      t->len, DDMA_FLAGS_IE);
         if (!res)
                 dev_err(hw->dev, "tx dma put source error\n");