X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fsbus%2Fdvma.c;h=378a1d68024da32556eeda812f5dfea7a0203b86;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=f15a3016e427bf9be58801bc478fcab4588e01d0;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c index f15a3016e..378a1d680 100644 --- a/drivers/sbus/dvma.c +++ b/drivers/sbus/dvma.c @@ -17,19 +17,11 @@ struct sbus_dma *dma_chain; -/* Print out the current values in the DMA control registers */ -extern __inline__ void dump_dma_regs(unsigned long dregs) -{ - printk("DMA CONTROL<%08x> ADDR<%08x> CNT<%08x> TEST<%08x>\n", - sbus_readl(dregs + DMA_CSR), sbus_readl(dregs + DMA_ADDR), - sbus_readl(dregs + DMA_COUNT), sbus_readl(dregs + DMA_TEST)); -} - void __init init_one_dvma(struct sbus_dma *dma, int num_dma) { printk("dma%d: ", num_dma); - dma->next = 0; + dma->next = NULL; dma->running = 0; /* No transfers going on as of yet */ dma->allocated = 0; /* No one has allocated us yet */ switch(sbus_readl(dma->regs + DMA_CSR)&DMA_DEVICE_ID) { @@ -64,9 +56,6 @@ void __init init_one_dvma(struct sbus_dma *dma, int num_dma) break; } printk("\n"); -#if 0 /* Clutters up the screen */ - dump_dma_regs(dma->regs); -#endif } /* Probe this SBus DMA module(s) */ @@ -121,7 +110,6 @@ void __init dvma_init(struct sbus_bus *sbus) void __init sun4_dvma_init(void) { struct sbus_dma *dma; - struct sbus_dma *dchain; struct resource r; if(sun4_dma_physaddr) {