aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2009-10-13 14:22:34 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:52:54 -0500
commitea071cc705e8bfba0c8bf84be8d4f9f4e9da6962 (patch)
tree9dafff9da1740dcfc475100b4d5dae963650cfd1 /sound/oss
parentf1fc6645a4d2cb944320ce8ed1e40f88059779e1 (diff)
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>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/au1550_ac97.c12
1 files changed, 7 insertions, 5 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)
614 /* Put two buffers on the ring to get things started. 614 /* Put two buffers on the ring to get things started.
615 */ 615 */
616 for (i=0; i<2; i++) { 616 for (i=0; i<2; i++) {
617 au1xxx_dbdma_put_dest(db->dmanr, db->nextIn, db->dma_fragsize); 617 au1xxx_dbdma_put_dest(db->dmanr, db->nextIn,
618 db->dma_fragsize, DDMA_FLAGS_IE);
618 619
619 db->nextIn += db->dma_fragsize; 620 db->nextIn += db->dma_fragsize;
620 if (db->nextIn >= db->rawbuf + db->dmasize) 621 if (db->nextIn >= db->rawbuf + db->dmasize)
@@ -733,7 +734,7 @@ static void dac_dma_interrupt(int irq, void *dev_id)
733 734
734 if (db->count >= db->fragsize) { 735 if (db->count >= db->fragsize) {
735 if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, 736 if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
736 db->fragsize) == 0) { 737 db->fragsize, DDMA_FLAGS_IE) == 0) {
737 err("qcount < 2 and no ring room!"); 738 err("qcount < 2 and no ring room!");
738 } 739 }
739 db->nextOut += db->fragsize; 740 db->nextOut += db->fragsize;
@@ -777,7 +778,8 @@ static void adc_dma_interrupt(int irq, void *dev_id)
777 778
778 /* Put a new empty buffer on the destination DMA. 779 /* Put a new empty buffer on the destination DMA.
779 */ 780 */
780 au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn, dp->dma_fragsize); 781 au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn,
782 dp->dma_fragsize, DDMA_FLAGS_IE);
781 783
782 dp->nextIn += dp->dma_fragsize; 784 dp->nextIn += dp->dma_fragsize;
783 if (dp->nextIn >= dp->rawbuf + dp->dmasize) 785 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)
1177 * we know the dma has stopped. 1179 * we know the dma has stopped.
1178 */ 1180 */
1179 while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { 1181 while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) {
1180 if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, 1182 if (au1xxx_dbdma_put_source(db->dmanr,
1181 db->fragsize) == 0) { 1183 db->nextOut, db->fragsize, DDMA_FLAGS_IE) == 0) {
1182 err("qcount < 2 and no ring room!"); 1184 err("qcount < 2 and no ring room!");
1183 } 1185 }
1184 db->nextOut += db->fragsize; 1186 db->nextOut += db->fragsize;