fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / sbus / dvma.c

diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c
index f15a301..57e1526 100644 (file)
--- a/drivers/sbus/dvma.c
+++ b/drivers/sbus/dvma.c
@@ -3,7 +3,6 @@
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -17,19 +16,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 +55,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 +109,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) {