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>

2 files changed, 11 insertions, 9 deletions

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 4191acccbcdb..b9ff0b798032 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -614,7 +614,8 @@ start_adc(struct au1550_state *s)
         /* Put two buffers on the ring to get things started.
         */
         for (i=0; i<2; i++) {
-                au1xxx_dbdma_put_dest(db->dmanr, db->nextIn, db->dma_fragsize);
+                au1xxx_dbdma_put_dest(db->dmanr, db->nextIn,
+                                db->dma_fragsize, DDMA_FLAGS_IE);
 
                 db->nextIn += db->dma_fragsize;
                 if (db->nextIn >= db->rawbuf + db->dmasize)
@@ -733,7 +734,7 @@ static void dac_dma_interrupt(int irq, void *dev_id)
 
         if (db->count >= db->fragsize) {
                 if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
-                                                        db->fragsize) == 0) {
+                                db->fragsize, DDMA_FLAGS_IE) == 0) {
                         err("qcount < 2 and no ring room!");
                 }
                 db->nextOut += db->fragsize;
@@ -777,7 +778,8 @@ static void adc_dma_interrupt(int irq, void *dev_id)
 
         /* Put a new empty buffer on the destination DMA.
         */
-        au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn, dp->dma_fragsize);
+        au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn,
+                              dp->dma_fragsize, DDMA_FLAGS_IE);
 
         dp->nextIn += dp->dma_fragsize;
         if (dp->nextIn >= dp->rawbuf + dp->dmasize)
@@ -1177,8 +1179,8 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
                  * we know the dma has stopped.
                  */
                 while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) {
-                        if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
-                                                        db->fragsize) == 0) {
+                        if (au1xxx_dbdma_put_source(db->dmanr,
+                                db->nextOut, db->fragsize, DDMA_FLAGS_IE) == 0) {
                                 err("qcount < 2 and no ring room!");
                         }
                         db->nextOut += db->fragsize;
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index 19e4d37eba1c..2929f1c42264 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -94,7 +94,7 @@ static const struct snd_pcm_hardware au1xpsc_pcm_hardware = {
 
 static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_source_flags(cd->ddma_chan,
+        au1xxx_dbdma_put_source(cd->ddma_chan,
                                 (void *)phys_to_virt(cd->dma_area),
                                 cd->period_bytes, DDMA_FLAGS_IE);
 
@@ -109,9 +109,9 @@ static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 
 static void au1x_pcm_queue_rx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_dest_flags(cd->ddma_chan,
-                                (void *)phys_to_virt(cd->dma_area),
-                                cd->period_bytes, DDMA_FLAGS_IE);
+        au1xxx_dbdma_put_dest(cd->ddma_chan,
+                              (void *)phys_to_virt(cd->dma_area),
+                              cd->period_bytes, DDMA_FLAGS_IE);
 
         /* update next-to-queue period */
         ++cd->q_period;