many more code cleanups for checkpatch.pl, most flagged as errors
[openwrt/staging/wigyori.git] / target / linux / ifxmips / files / arch / mips / ifxmips / dma-core.c
index 1c97b16eb6e74897aad169b43014b247a4013646..b334200cae18af0a39243af25c841860c9a38045 100644 (file)
@@ -15,9 +15,9 @@
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/errno.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <asm/ifxmips/ifxmips.h>
 #include <asm/ifxmips/ifxmips_irq.h>
 #define DMA_INT_BUDGET      100        /*budget for interrupt handling */
 #define DMA_POLL_COUNTER    4  /*fix me, set the correct counter value here! */
 
-extern void mask_and_ack_ifxmips_irq (unsigned int irq_nr);
-extern void enable_ifxmips_irq (unsigned int irq_nr);
-extern void disable_ifxmips_irq (unsigned int irq_nr);
+extern void ifxmips_mask_and_ack_irq(unsigned int irq_nr);
+extern void ifxmips_enable_irq(unsigned int irq_nr);
+extern void ifxmips_disable_irq(unsigned int irq_nr);
 
 u64 *g_desc_list;
-_dma_device_info dma_devs[MAX_DMA_DEVICE_NUM];
-_dma_channel_info dma_chan[MAX_DMA_CHANNEL_NUM];
+struct dma_device_info dma_devs[MAX_DMA_DEVICE_NUM];
+struct dma_channel_info dma_chan[MAX_DMA_CHANNEL_NUM];
 
-char global_device_name[MAX_DMA_DEVICE_NUM][20] =
-       { {"PPE"}, {"DEU"}, {"SPI"}, {"SDIO"}, {"MCTRL0"}, {"MCTRL1"} };
+static const char *global_device_name[MAX_DMA_DEVICE_NUM] =
+       { "PPE", "DEU", "SPI", "SDIO", "MCTRL0", "MCTRL1" };
 
-_dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
+struct dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
        {"PPE", IFXMIPS_DMA_RX, 0, IFXMIPS_DMA_CH0_INT, 0},
        {"PPE", IFXMIPS_DMA_TX, 0, IFXMIPS_DMA_CH1_INT, 0},
        {"PPE", IFXMIPS_DMA_RX, 1, IFXMIPS_DMA_CH2_INT, 1},
@@ -66,236 +66,211 @@ _dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
        {"MCTRL1", IFXMIPS_DMA_TX, 1, IFXMIPS_DMA_CH19_INT, 1}
 };
 
-_dma_chan_map *chan_map = default_dma_map;
-volatile u32 g_ifxmips_dma_int_status = 0;
-volatile int g_ifxmips_dma_in_process = 0;/*0=not in process,1=in process*/
+struct dma_chan_map *chan_map = default_dma_map;
+volatile u32 g_ifxmips_dma_int_status;
+volatile int g_ifxmips_dma_in_process; /* 0=not in process, 1=in process */
 
-void do_dma_tasklet (unsigned long);
-DECLARE_TASKLET (dma_tasklet, do_dma_tasklet, 0);
+void do_dma_tasklet(unsigned long);
+DECLARE_TASKLET(dma_tasklet, do_dma_tasklet, 0);
 
-u8*
-common_buffer_alloc (int len, int *byte_offset, void **opt)
+u8 *common_buffer_alloc(int len, int *byte_offset, void **opt)
 {
-       u8 *buffer = (u8 *) kmalloc (len * sizeof (u8), GFP_KERNEL);
+       u8 *buffer = kmalloc(len * sizeof(u8), GFP_KERNEL);
 
        *byte_offset = 0;
 
        return buffer;
 }
 
-void
-common_buffer_free (u8 *dataptr, void *opt)
+void common_buffer_free(u8 *dataptr, void *opt)
 {
-       if (dataptr)
-               kfree(dataptr);
+       kfree(dataptr);
 }
 
-void
-enable_ch_irq (_dma_channel_info *pCh)
+void enable_ch_irq(struct dma_channel_info *pCh)
 {
        int chan_no = (int)(pCh - dma_chan);
-       int flag;
+       unsigned long flag;
 
        local_irq_save(flag);
-       writel(chan_no, IFXMIPS_DMA_CS);
-       writel(0x4a, IFXMIPS_DMA_CIE);
-       writel(readl(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(0x4a, IFXMIPS_DMA_CIE);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
        local_irq_restore(flag);
-       enable_ifxmips_irq(pCh->irq);
+       ifxmips_enable_irq(pCh->irq);
 }
 
-void
-disable_ch_irq (_dma_channel_info *pCh)
+void disable_ch_irq(struct dma_channel_info *pCh)
 {
-       int flag;
+       unsigned long flag;
        int chan_no = (int) (pCh - dma_chan);
 
        local_irq_save(flag);
        g_ifxmips_dma_int_status &= ~(1 << chan_no);
-       writel(chan_no, IFXMIPS_DMA_CS);
-       writel(0, IFXMIPS_DMA_CIE);
-       writel(readl(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(0, IFXMIPS_DMA_CIE);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN);
        local_irq_restore(flag);
-       mask_and_ack_ifxmips_irq(pCh->irq);
+       ifxmips_mask_and_ack_irq(pCh->irq);
 }
 
-void
-open_chan (_dma_channel_info *pCh)
+void open_chan(struct dma_channel_info *pCh)
 {
-       int flag;
+       unsigned long flag;
        int chan_no = (int)(pCh - dma_chan);
 
        local_irq_save(flag);
-       writel(chan_no, IFXMIPS_DMA_CS);
-       writel(readl(IFXMIPS_DMA_CCTRL) | 1, IFXMIPS_DMA_CCTRL);
-       if(pCh->dir == IFXMIPS_DMA_RX)
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) | 1, IFXMIPS_DMA_CCTRL);
+       if (pCh->dir == IFXMIPS_DMA_RX)
                enable_ch_irq(pCh);
        local_irq_restore(flag);
 }
 
-void
-close_chan(_dma_channel_info *pCh)
+void close_chan(struct dma_channel_info *pCh)
 {
-       int flag;
+       unsigned long flag;
        int chan_no = (int) (pCh - dma_chan);
 
        local_irq_save(flag);
-       writel(chan_no, IFXMIPS_DMA_CS);
-       writel(readl(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
        disable_ch_irq(pCh);
        local_irq_restore(flag);
 }
 
-void
-reset_chan (_dma_channel_info *pCh)
+void reset_chan(struct dma_channel_info *pCh)
 {
        int chan_no = (int) (pCh - dma_chan);
 
-       writel(chan_no, IFXMIPS_DMA_CS);
-       writel(readl(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
 }
 
-void
-rx_chan_intr_handler (int chan_no)
+void rx_chan_intr_handler(int chan_no)
 {
-       _dma_device_info *pDev = (_dma_device_info *)dma_chan[chan_no].dma_dev;
-       _dma_channel_info *pCh = &dma_chan[chan_no];
+       struct dma_device_info *pDev = (struct dma_device_info *)dma_chan[chan_no].dma_dev;
+       struct dma_channel_info *pCh = &dma_chan[chan_no];
        struct rx_desc *rx_desc_p;
        int tmp;
-       int flag;
+       unsigned long flag;
 
        /*handle command complete interrupt */
-       rx_desc_p = (struct rx_desc*)pCh->desc_base + pCh->curr_desc;
+       rx_desc_p = (struct rx_desc *)pCh->desc_base + pCh->curr_desc;
        if (rx_desc_p->status.field.OWN == CPU_OWN
            && rx_desc_p->status.field.C
            && rx_desc_p->status.field.data_length < 1536){
-               /*Every thing is correct, then we inform the upper layer */
+               /* Every thing is correct, then we inform the upper layer */
                pDev->current_rx_chan = pCh->rel_chan_no;
-               if(pDev->intr_handler)
+               if (pDev->intr_handler)
                        pDev->intr_handler(pDev, RCV_INT);
                pCh->weight--;
        } else {
                local_irq_save(flag);
-               tmp = readl(IFXMIPS_DMA_CS);
-               writel(chan_no, IFXMIPS_DMA_CS);
-               writel(readl(IFXMIPS_DMA_CIS) | 0x7e, IFXMIPS_DMA_CIS);
-               writel(tmp, IFXMIPS_DMA_CS);
+               tmp = ifxmips_r32(IFXMIPS_DMA_CS);
+               ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+               ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CIS) | 0x7e, IFXMIPS_DMA_CIS);
+               ifxmips_w32(tmp, IFXMIPS_DMA_CS);
                g_ifxmips_dma_int_status &= ~(1 << chan_no);
                local_irq_restore(flag);
-               enable_ifxmips_irq(dma_chan[chan_no].irq);
+               ifxmips_enable_irq(dma_chan[chan_no].irq);
        }
 }
 
-inline void
-tx_chan_intr_handler (int chan_no)
+inline void tx_chan_intr_handler(int chan_no)
 {
-       _dma_device_info *pDev = (_dma_device_info*)dma_chan[chan_no].dma_dev;
-       _dma_channel_info *pCh = &dma_chan[chan_no];
-    int tmp;
-    int flag;
-
-    local_irq_save(flag);
-    tmp = readl(IFXMIPS_DMA_CS);
-    writel(chan_no, IFXMIPS_DMA_CS);
-    writel(readl(IFXMIPS_DMA_CIS) | 0x7e, IFXMIPS_DMA_CIS);
-    writel(tmp, IFXMIPS_DMA_CS);
-    g_ifxmips_dma_int_status &= ~(1 << chan_no);
-    local_irq_restore(flag);
+       struct dma_device_info *pDev = (struct dma_device_info *)dma_chan[chan_no].dma_dev;
+       struct dma_channel_info *pCh = &dma_chan[chan_no];
+       int tmp;
+       unsigned long flag;
+
+       local_irq_save(flag);
+       tmp = ifxmips_r32(IFXMIPS_DMA_CS);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CIS) | 0x7e, IFXMIPS_DMA_CIS);
+       ifxmips_w32(tmp, IFXMIPS_DMA_CS);
+       g_ifxmips_dma_int_status &= ~(1 << chan_no);
+       local_irq_restore(flag);
        pDev->current_tx_chan = pCh->rel_chan_no;
        if (pDev->intr_handler)
                pDev->intr_handler(pDev, TRANSMIT_CPT_INT);
 }
 
-void
-do_dma_tasklet (unsigned long unused)
+void do_dma_tasklet(unsigned long unused)
 {
        int i;
        int chan_no = 0;
        int budget = DMA_INT_BUDGET;
        int weight = 0;
-    int flag;
+       unsigned long flag;
 
-       while (g_ifxmips_dma_int_status)
-       {
-               if (budget-- < 0)
-               {
+       while (g_ifxmips_dma_int_status) {
+               if (budget-- < 0) {
                        tasklet_schedule(&dma_tasklet);
                        return;
                }
                chan_no = -1;
                weight = 0;
-               for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-               {
-                       if ((g_ifxmips_dma_int_status & (1 << i)) && dma_chan[i].weight > 0)
-                       {
-                               if (dma_chan[i].weight > weight)
-                               {
+               for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
+                       if ((g_ifxmips_dma_int_status & (1 << i)) && dma_chan[i].weight > 0) {
+                               if (dma_chan[i].weight > weight) {
                                        chan_no = i;
-                    weight = dma_chan[chan_no].weight;
-                }
+                                       weight = dma_chan[chan_no].weight;
+                               }
                        }
                }
 
-               if (chan_no >= 0)
-               {
+               if (chan_no >= 0) {
                        if (chan_map[chan_no].dir == IFXMIPS_DMA_RX)
                                rx_chan_intr_handler(chan_no);
                        else
                                tx_chan_intr_handler(chan_no);
                } else {
                        for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-                       {
                                dma_chan[i].weight = dma_chan[i].default_weight;
-                       }
                }
        }
 
-    local_irq_save(flag);
+       local_irq_save(flag);
        g_ifxmips_dma_in_process = 0;
-    if (g_ifxmips_dma_int_status)
-       {
-        g_ifxmips_dma_in_process = 1;
-        tasklet_schedule(&dma_tasklet);
-    }
-    local_irq_restore(flag);
+       if (g_ifxmips_dma_int_status) {
+               g_ifxmips_dma_in_process = 1;
+               tasklet_schedule(&dma_tasklet);
+       }
+       local_irq_restore(flag);
 }
 
-irqreturn_t
-dma_interrupt (int irq, void *dev_id)
+irqreturn_t dma_interrupt(int irq, void *dev_id)
 {
-       _dma_channel_info *pCh;
+       struct dma_channel_info *pCh;
        int chan_no = 0;
        int tmp;
 
-       pCh = (_dma_channel_info*)dev_id;
+       pCh = (struct dma_channel_info *)dev_id;
        chan_no = (int)(pCh - dma_chan);
        if (chan_no < 0 || chan_no > 19)
                BUG();
 
-       tmp = readl(IFXMIPS_DMA_IRNEN);
-       writel(0, IFXMIPS_DMA_IRNEN);
+       tmp = ifxmips_r32(IFXMIPS_DMA_IRNEN);
+       ifxmips_w32(0, IFXMIPS_DMA_IRNEN);
        g_ifxmips_dma_int_status |= 1 << chan_no;
-       writel(tmp, IFXMIPS_DMA_IRNEN);
-       mask_and_ack_ifxmips_irq(irq);
+       ifxmips_w32(tmp, IFXMIPS_DMA_IRNEN);
+       ifxmips_mask_and_ack_irq(irq);
 
-    if (!g_ifxmips_dma_in_process)
-       {
-        g_ifxmips_dma_in_process = 1;
-        tasklet_schedule(&dma_tasklet);
-    }
+       if (!g_ifxmips_dma_in_process) {
+               g_ifxmips_dma_in_process = 1;
+               tasklet_schedule(&dma_tasklet);
+       }
 
        return IRQ_HANDLED;
 }
 
-_dma_device_info*
-dma_device_reserve (char *dev_name)
+struct dma_device_info *dma_device_reserve(char *dev_name)
 {
        int i;
 
-       for (i = 0; i < MAX_DMA_DEVICE_NUM; i++)
-       {
-               if (strcmp(dev_name, dma_devs[i].device_name) == 0)
-               {
+       for (i = 0; i < MAX_DMA_DEVICE_NUM; i++) {
+               if (strcmp(dev_name, dma_devs[i].device_name) == 0) {
                        if (dma_devs[i].reserved)
                                return NULL;
                        dma_devs[i].reserved = 1;
@@ -305,64 +280,59 @@ dma_device_reserve (char *dev_name)
 
        return &dma_devs[i];
 }
+EXPORT_SYMBOL(dma_device_reserve);
 
-void
-dma_device_release (_dma_device_info *dev)
+void dma_device_release(struct dma_device_info *dev)
 {
        dev->reserved = 0;
 }
+EXPORT_SYMBOL(dma_device_release);
 
-void
-dma_device_register(_dma_device_info *dev)
+void dma_device_register(struct dma_device_info *dev)
 {
        int i, j;
        int chan_no = 0;
        u8 *buffer;
        int byte_offset;
-       int flag;
-       _dma_device_info *pDev;
-       _dma_channel_info *pCh;
+       unsigned long flag;
+       struct dma_device_info *pDev;
+       struct dma_channel_info *pCh;
        struct rx_desc *rx_desc_p;
        struct tx_desc *tx_desc_p;
 
-       for (i = 0; i < dev->max_tx_chan_num; i++)
-       {
+       for (i = 0; i < dev->max_tx_chan_num; i++) {
                pCh = dev->tx_chan[i];
-               if (pCh->control == IFXMIPS_DMA_CH_ON)
-               {
+               if (pCh->control == IFXMIPS_DMA_CH_ON) {
                        chan_no = (int)(pCh - dma_chan);
-                       for (j = 0; j < pCh->desc_len; j++)
-                       {
-                               tx_desc_p = (struct tx_desc*)pCh->desc_base + j;
+                       for (j = 0; j < pCh->desc_len; j++) {
+                               tx_desc_p = (struct tx_desc *)pCh->desc_base + j;
                                memset(tx_desc_p, 0, sizeof(struct tx_desc));
                        }
                        local_irq_save(flag);
-                       writel(chan_no, IFXMIPS_DMA_CS);
-                       /*check if the descriptor length is changed */
-                       if (readl(IFXMIPS_DMA_CDLEN) != pCh->desc_len)
-                               writel(pCh->desc_len, IFXMIPS_DMA_CDLEN);
-
-                       writel(readl(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
-                       writel(readl(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
-                       while (readl(IFXMIPS_DMA_CCTRL) & 2){};
-                       writel(readl(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
-                       writel(0x30100, IFXMIPS_DMA_CCTRL);     /*reset and enable channel,enable channel later */
+                       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+                       /* check if the descriptor length is changed */
+                       if (ifxmips_r32(IFXMIPS_DMA_CDLEN) != pCh->desc_len)
+                               ifxmips_w32(pCh->desc_len, IFXMIPS_DMA_CDLEN);
+
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
+                       while (ifxmips_r32(IFXMIPS_DMA_CCTRL) & 2)
+                               ;
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
+                       ifxmips_w32(0x30100, IFXMIPS_DMA_CCTRL); /* reset and enable channel,enable channel later */
                        local_irq_restore(flag);
                }
        }
 
-       for (i = 0; i < dev->max_rx_chan_num; i++)
-       {
+       for (i = 0; i < dev->max_rx_chan_num; i++) {
                pCh = dev->rx_chan[i];
-               if (pCh->control == IFXMIPS_DMA_CH_ON)
-               {
+               if (pCh->control == IFXMIPS_DMA_CH_ON) {
                        chan_no = (int)(pCh - dma_chan);
 
-                       for (j = 0; j < pCh->desc_len; j++)
-                       {
-                               rx_desc_p = (struct rx_desc*)pCh->desc_base + j;
-                               pDev = (_dma_device_info*)(pCh->dma_dev);
-                               buffer = pDev->buffer_alloc(pCh->packet_size, &byte_offset, (void*)&(pCh->opt[j]));
+                       for (j = 0; j < pCh->desc_len; j++) {
+                               rx_desc_p = (struct rx_desc *)pCh->desc_base + j;
+                               pDev = (struct dma_device_info *)(pCh->dma_dev);
+                               buffer = pDev->buffer_alloc(pCh->packet_size, &byte_offset, (void *)&(pCh->opt[j]));
                                if (!buffer)
                                        break;
 
@@ -376,69 +346,66 @@ dma_device_register(_dma_device_info *dev)
                        }
 
                        local_irq_save(flag);
-                       writel(chan_no, IFXMIPS_DMA_CS);
-                       /*check if the descriptor length is changed */
-                       if (readl(IFXMIPS_DMA_CDLEN) != pCh->desc_len)
-                               writel(pCh->desc_len, IFXMIPS_DMA_CDLEN);
-                       writel(readl(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
-                       writel(readl(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
-                       while (readl(IFXMIPS_DMA_CCTRL) & 2){};
-                       writel(0x0a, IFXMIPS_DMA_CIE);  /*fix me, should enable all the interrupts here? */
-                       writel(readl(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
-                       writel(0x30000, IFXMIPS_DMA_CCTRL);
+                       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+                       /* check if the descriptor length is changed */
+                       if (ifxmips_r32(IFXMIPS_DMA_CDLEN) != pCh->desc_len)
+                               ifxmips_w32(pCh->desc_len, IFXMIPS_DMA_CDLEN);
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) | 2, IFXMIPS_DMA_CCTRL);
+                       while (ifxmips_r32(IFXMIPS_DMA_CCTRL) & 2)
+                               ;
+                       ifxmips_w32(0x0a, IFXMIPS_DMA_CIE); /* fix me, should enable all the interrupts here? */
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) | (1 << chan_no), IFXMIPS_DMA_IRNEN);
+                       ifxmips_w32(0x30000, IFXMIPS_DMA_CCTRL);
                        local_irq_restore(flag);
-                       enable_ifxmips_irq(dma_chan[chan_no].irq);
+                       ifxmips_enable_irq(dma_chan[chan_no].irq);
                }
        }
 }
+EXPORT_SYMBOL(dma_device_register);
 
-void
-dma_device_unregister (_dma_device_info *dev)
+void dma_device_unregister(struct dma_device_info *dev)
 {
        int i, j;
        int chan_no;
-       _dma_channel_info *pCh;
+       struct dma_channel_info *pCh;
        struct rx_desc *rx_desc_p;
        struct tx_desc *tx_desc_p;
-       int flag;
+       unsigned long flag;
 
-       for (i = 0; i < dev->max_tx_chan_num; i++)
-       {
+       for (i = 0; i < dev->max_tx_chan_num; i++) {
                pCh = dev->tx_chan[i];
-               if (pCh->control == IFXMIPS_DMA_CH_ON)
-               {
+               if (pCh->control == IFXMIPS_DMA_CH_ON) {
                        chan_no = (int)(dev->tx_chan[i] - dma_chan);
-                       local_irq_save (flag);
-                       writel(chan_no, IFXMIPS_DMA_CS);
+                       local_irq_save(flag);
+                       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
                        pCh->curr_desc = 0;
                        pCh->prev_desc = 0;
                        pCh->control = IFXMIPS_DMA_CH_OFF;
-                       writel(0, IFXMIPS_DMA_CIE);     /*fix me, should disable all the interrupts here? */
-                       writel(readl(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN);  /*disable interrupts */
-                       writel(readl(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
-                       while (readl(IFXMIPS_DMA_CCTRL) & 1) {};
-                       local_irq_restore (flag);
-
-                       for (j = 0; j < pCh->desc_len; j++)
-                       {
-                               tx_desc_p = (struct tx_desc*)pCh->desc_base + j;
+                       ifxmips_w32(0, IFXMIPS_DMA_CIE); /* fix me, should disable all the interrupts here? */
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN); /* disable interrupts */
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
+                       while (ifxmips_r32(IFXMIPS_DMA_CCTRL) & 1)
+                               ;
+                       local_irq_restore(flag);
+
+                       for (j = 0; j < pCh->desc_len; j++) {
+                               tx_desc_p = (struct tx_desc *)pCh->desc_base + j;
                                if ((tx_desc_p->status.field.OWN == CPU_OWN && tx_desc_p->status.field.C)
-                                               || (tx_desc_p->status.field.OWN == DMA_OWN && tx_desc_p->status.field.data_length > 0))
-                               {
-                                       dev->buffer_free ((u8 *) __va (tx_desc_p->Data_Pointer), (void*)pCh->opt[j]);
+                                               || (tx_desc_p->status.field.OWN == DMA_OWN && tx_desc_p->status.field.data_length > 0)) {
+                                       dev->buffer_free((u8 *) __va(tx_desc_p->Data_Pointer), (void *)pCh->opt[j]);
                                }
                                tx_desc_p->status.field.OWN = CPU_OWN;
-                               memset (tx_desc_p, 0, sizeof (struct tx_desc));
+                               memset(tx_desc_p, 0, sizeof(struct tx_desc));
                        }
-                       //TODO should free buffer that is not transferred by dma
+                       /* TODO should free buffer that is not transferred by dma */
                }
        }
 
-       for (i = 0; i < dev->max_rx_chan_num; i++)
-       {
+       for (i = 0; i < dev->max_rx_chan_num; i++) {
                pCh = dev->rx_chan[i];
                chan_no = (int)(dev->rx_chan[i] - dma_chan);
-               disable_ifxmips_irq(pCh->irq);
+               ifxmips_disable_irq(pCh->irq);
 
                local_irq_save(flag);
                g_ifxmips_dma_int_status &= ~(1 << chan_no);
@@ -446,68 +413,61 @@ dma_device_unregister (_dma_device_info *dev)
                pCh->prev_desc = 0;
                pCh->control = IFXMIPS_DMA_CH_OFF;
 
-               writel(chan_no, IFXMIPS_DMA_CS);
-               writel(0, IFXMIPS_DMA_CIE); /*fix me, should disable all the interrupts here? */
-               writel(readl(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN);  /*disable interrupts */
-               writel(readl(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
-               while (readl(IFXMIPS_DMA_CCTRL) & 1) {};
+               ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+               ifxmips_w32(0, IFXMIPS_DMA_CIE); /* fix me, should disable all the interrupts here? */
+               ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_IRNEN) & ~(1 << chan_no), IFXMIPS_DMA_IRNEN); /* disable interrupts */
+               ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~1, IFXMIPS_DMA_CCTRL);
+               while (ifxmips_r32(IFXMIPS_DMA_CCTRL) & 1)
+                       ;
 
-               local_irq_restore (flag);
-               for (j = 0; j < pCh->desc_len; j++)
-               {
+               local_irq_restore(flag);
+               for (j = 0; j < pCh->desc_len; j++) {
                        rx_desc_p = (struct rx_desc *) pCh->desc_base + j;
-                       if ((rx_desc_p->status.field.OWN == CPU_OWN 
+                       if ((rx_desc_p->status.field.OWN == CPU_OWN
                             && rx_desc_p->status.field.C)
                            || (rx_desc_p->status.field.OWN == DMA_OWN
                                && rx_desc_p->status.field.data_length > 0)) {
-                               dev->buffer_free ((u8 *)
-                                                 __va (rx_desc_p->
-                                                       Data_Pointer),
-                                                 (void *) pCh->opt[j]);
+                               dev->buffer_free((u8 *)
+                                                __va(rx_desc_p->Data_Pointer),
+                                                (void *) pCh->opt[j]);
                        }
                }
        }
 }
+EXPORT_SYMBOL(dma_device_unregister);
 
-int
-dma_device_read (struct dma_device_info *dma_dev, u8 ** dataptr, void **opt)
+int dma_device_read(struct dma_device_info *dma_dev, u8 **dataptr, void **opt)
 {
        u8 *buf;
        int len;
        int byte_offset = 0;
        void *p = NULL;
-       _dma_channel_info *pCh = dma_dev->rx_chan[dma_dev->current_rx_chan];
+       struct dma_channel_info *pCh = dma_dev->rx_chan[dma_dev->current_rx_chan];
        struct rx_desc *rx_desc_p;
 
-       /*get the rx data first */
+       /* get the rx data first */
        rx_desc_p = (struct rx_desc *) pCh->desc_base + pCh->curr_desc;
        if (!(rx_desc_p->status.field.OWN == CPU_OWN && rx_desc_p->status.field.C))
-       {
                return 0;
-       }
 
-       buf = (u8 *) __va (rx_desc_p->Data_Pointer);
-       *(u32*)dataptr = (u32)buf;
+       buf = (u8 *) __va(rx_desc_p->Data_Pointer);
+       *(u32 *)dataptr = (u32)buf;
        len = rx_desc_p->status.field.data_length;
 
        if (opt)
-       {
-               *(int*)opt = (int)pCh->opt[pCh->curr_desc];
-       }
+               *(int *)opt = (int)pCh->opt[pCh->curr_desc];
 
-       /*replace with a new allocated buffer */
+       /* replace with a new allocated buffer */
        buf = dma_dev->buffer_alloc(pCh->packet_size, &byte_offset, &p);
 
-       if (buf)
-       {
-               dma_cache_inv ((unsigned long) buf,
-               pCh->packet_size);
+       if (buf) {
+               dma_cache_inv((unsigned long) buf, pCh->packet_size);
                pCh->opt[pCh->curr_desc] = p;
-               wmb ();
+               wmb();
 
-               rx_desc_p->Data_Pointer = (u32) CPHYSADDR ((u32) buf);
+               rx_desc_p->Data_Pointer = (u32) CPHYSADDR((u32) buf);
                rx_desc_p->status.word = (DMA_OWN << 31) | ((byte_offset) << 23) | pCh->packet_size;
-               wmb ();
+               wmb();
        } else {
                *(u32 *) dataptr = 0;
                if (opt)
@@ -515,55 +475,53 @@ dma_device_read (struct dma_device_info *dma_dev, u8 ** dataptr, void **opt)
                len = 0;
        }
 
-       /*increase the curr_desc pointer */
+       /* increase the curr_desc pointer */
        pCh->curr_desc++;
        if (pCh->curr_desc == pCh->desc_len)
                pCh->curr_desc = 0;
 
        return len;
 }
+EXPORT_SYMBOL(dma_device_read);
 
-int
-dma_device_write (struct dma_device_info *dma_dev, u8 * dataptr, int len, void *opt)
+int dma_device_write(struct dma_device_info *dma_dev, u8 *dataptr, int len, void *opt)
 {
-       int flag;
+       unsigned long flag;
        u32 tmp, byte_offset;
-       _dma_channel_info *pCh;
+       struct dma_channel_info *pCh;
        int chan_no;
        struct tx_desc *tx_desc_p;
-       local_irq_save (flag);
+       local_irq_save(flag);
 
        pCh = dma_dev->tx_chan[dma_dev->current_tx_chan];
-       chan_no = (int)(pCh - (_dma_channel_info *) dma_chan);
+       chan_no = (int)(pCh - (struct dma_channel_info *) dma_chan);
 
-       tx_desc_p = (struct tx_desc*)pCh->desc_base + pCh->prev_desc;
-       while (tx_desc_p->status.field.OWN == CPU_OWN && tx_desc_p->status.field.C)
-       {
-               dma_dev->buffer_free((u8 *) __va (tx_desc_p->Data_Pointer), pCh->opt[pCh->prev_desc]);
-               memset(tx_desc_p, 0, sizeof (struct tx_desc));
+       tx_desc_p = (struct tx_desc *)pCh->desc_base + pCh->prev_desc;
+       while (tx_desc_p->status.field.OWN == CPU_OWN && tx_desc_p->status.field.C) {
+               dma_dev->buffer_free((u8 *) __va(tx_desc_p->Data_Pointer), pCh->opt[pCh->prev_desc]);
+               memset(tx_desc_p, 0, sizeof(struct tx_desc));
                pCh->prev_desc = (pCh->prev_desc + 1) % (pCh->desc_len);
-               tx_desc_p = (struct tx_desc*)pCh->desc_base + pCh->prev_desc;
+               tx_desc_p = (struct tx_desc *)pCh->desc_base + pCh->prev_desc;
        }
-       tx_desc_p = (struct tx_desc*)pCh->desc_base + pCh->curr_desc;
-       /*Check whether this descriptor is available */
-       if (tx_desc_p->status.field.OWN == DMA_OWN || tx_desc_p->status.field.C)
-       {
-               /*if not , the tell the upper layer device */
+       tx_desc_p = (struct tx_desc *)pCh->desc_base + pCh->curr_desc;
+       /* Check whether this descriptor is available */
+       if (tx_desc_p->status.field.OWN == DMA_OWN || tx_desc_p->status.field.C) {
+               /* if not, the tell the upper layer device */
                dma_dev->intr_handler (dma_dev, TX_BUF_FULL_INT);
                local_irq_restore(flag);
-               printk (KERN_INFO "%s %d: failed to write!\n", __func__, __LINE__);
+               printk(KERN_INFO "%s %d: failed to write!\n", __func__, __LINE__);
 
                return 0;
        }
        pCh->opt[pCh->curr_desc] = opt;
-       /*byte offset----to adjust the starting address of the data buffer, should be multiple of the burst length. */
-       byte_offset = ((u32) CPHYSADDR ((u32) dataptr)) % ((dma_dev->tx_burst_len) * 4);
-       dma_cache_wback ((unsigned long) dataptr, len);
-       wmb ();
-       tx_desc_p->Data_Pointer = (u32) CPHYSADDR ((u32) dataptr) - byte_offset;
-       wmb ();
+       /* byte offset----to adjust the starting address of the data buffer, should be multiple of the burst length. */
+       byte_offset = ((u32) CPHYSADDR((u32) dataptr)) % ((dma_dev->tx_burst_len) * 4);
+       dma_cache_wback((unsigned long) dataptr, len);
+       wmb();
+       tx_desc_p->Data_Pointer = (u32) CPHYSADDR((u32) dataptr) - byte_offset;
+       wmb();
        tx_desc_p->status.word = (DMA_OWN << 31) | DMA_DESC_SOP_SET | DMA_DESC_EOP_SET | ((byte_offset) << 23) | len;
-       wmb ();
+       wmb();
 
        pCh->curr_desc++;
        if (pCh->curr_desc == pCh->desc_len)
@@ -571,49 +529,43 @@ dma_device_write (struct dma_device_info *dma_dev, u8 * dataptr, int len, void *
 
        /*Check whether this descriptor is available */
        tx_desc_p = (struct tx_desc *) pCh->desc_base + pCh->curr_desc;
-       if (tx_desc_p->status.field.OWN == DMA_OWN)
-       {
+       if (tx_desc_p->status.field.OWN == DMA_OWN) {
                /*if not , the tell the upper layer device */
                dma_dev->intr_handler (dma_dev, TX_BUF_FULL_INT);
        }
 
-       writel(chan_no, IFXMIPS_DMA_CS);
-       tmp = readl(IFXMIPS_DMA_CCTRL);
+       ifxmips_w32(chan_no, IFXMIPS_DMA_CS);
+       tmp = ifxmips_r32(IFXMIPS_DMA_CCTRL);
 
        if (!(tmp & 1))
-               pCh->open (pCh);
+               pCh->open(pCh);
 
-       local_irq_restore (flag);
+       local_irq_restore(flag);
 
        return len;
 }
+EXPORT_SYMBOL(dma_device_write);
 
-int
-map_dma_chan(_dma_chan_map *map)
+int map_dma_chan(struct dma_chan_map *map)
 {
        int i, j;
        int result;
 
        for (i = 0; i < MAX_DMA_DEVICE_NUM; i++)
-       {
-               strcpy(dma_devs[i].device_name, global_device_name[i]);
-       }
+               dma_devs[i].device_name = &global_device_name[i];
 
-       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-       {
+       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
                dma_chan[i].irq = map[i].irq;
-               result = request_irq(dma_chan[i].irq, dma_interrupt, IRQF_DISABLED, "dma-core", (void*)&dma_chan[i]);
-               if (result)
-               {
-                       printk("error, cannot get dma_irq!\n");
+               result = request_irq(dma_chan[i].irq, dma_interrupt, IRQF_DISABLED, map[i].dev_name, (void *)&dma_chan[i]);
+               if (result) {
+                       printk(KERN_WARNING "error, cannot get dma_irq!\n");
                        free_irq(dma_chan[i].irq, (void *) &dma_interrupt);
 
                        return -EFAULT;
                }
        }
 
-       for (i = 0; i < MAX_DMA_DEVICE_NUM; i++)
-       {
+       for (i = 0; i < MAX_DMA_DEVICE_NUM; i++) {
                dma_devs[i].num_tx_chan = 0;    /*set default tx channel number to be one */
                dma_devs[i].num_rx_chan = 0;    /*set default rx channel number to be one */
                dma_devs[i].max_rx_chan_num = 0;
@@ -623,20 +575,17 @@ map_dma_chan(_dma_chan_map *map)
                dma_devs[i].intr_handler = NULL;
                dma_devs[i].tx_burst_len = 4;
                dma_devs[i].rx_burst_len = 4;
-               if (i == 0)
-               {
-                       writel(0, IFXMIPS_DMA_PS);
-                       writel(readl(IFXMIPS_DMA_PCTRL) | ((0xf << 8) | (1 << 6)), IFXMIPS_DMA_PCTRL);  /*enable dma drop */
+               if (i == 0) {
+                       ifxmips_w32(0, IFXMIPS_DMA_PS);
+                       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_PCTRL) | ((0xf << 8) | (1 << 6)), IFXMIPS_DMA_PCTRL);       /*enable dma drop */
                }
 
-               if (i == 1)
-               {
-                       writel(1, IFXMIPS_DMA_PS);
-                       writel(0x14, IFXMIPS_DMA_PCTRL);        /*deu port setting */
+               if (i == 1) {
+                       ifxmips_w32(1, IFXMIPS_DMA_PS);
+                       ifxmips_w32(0x14, IFXMIPS_DMA_PCTRL);   /*deu port setting */
                }
 
-               for (j = 0; j < MAX_DMA_CHANNEL_NUM; j++)
-               {
+               for (j = 0; j < MAX_DMA_CHANNEL_NUM; j++) {
                        dma_chan[j].byte_offset = 0;
                        dma_chan[j].open = &open_chan;
                        dma_chan[j].close = &close_chan;
@@ -651,26 +600,23 @@ map_dma_chan(_dma_chan_map *map)
                        dma_chan[j].prev_desc = 0;
                }
 
-               for (j = 0; j < MAX_DMA_CHANNEL_NUM; j++)
-               {
-                       if (strcmp(dma_devs[i].device_name, map[j].dev_name) == 0)
-                       {
-                               if (map[j].dir == IFXMIPS_DMA_RX)
-                               {
+               for (j = 0; j < MAX_DMA_CHANNEL_NUM; j++) {
+                       if (strcmp(dma_devs[i].device_name, map[j].dev_name) == 0) {
+                               if (map[j].dir == IFXMIPS_DMA_RX) {
                                        dma_chan[j].dir = IFXMIPS_DMA_RX;
                                        dma_devs[i].max_rx_chan_num++;
                                        dma_devs[i].rx_chan[dma_devs[i].max_rx_chan_num - 1] = &dma_chan[j];
                                        dma_devs[i].rx_chan[dma_devs[i].max_rx_chan_num - 1]->pri = map[j].pri;
-                                       dma_chan[j].dma_dev = (void*)&dma_devs[i];
-                               } else if(map[j].dir == IFXMIPS_DMA_TX)
-                               { /*TX direction */
+                                       dma_chan[j].dma_dev = (void *)&dma_devs[i];
+                               } else if (map[j].dir == IFXMIPS_DMA_TX) {
+                                       /*TX direction */
                                        dma_chan[j].dir = IFXMIPS_DMA_TX;
                                        dma_devs[i].max_tx_chan_num++;
                                        dma_devs[i].tx_chan[dma_devs[i].max_tx_chan_num - 1] = &dma_chan[j];
                                        dma_devs[i].tx_chan[dma_devs[i].max_tx_chan_num - 1]->pri = map[j].pri;
-                                       dma_chan[j].dma_dev = (void*)&dma_devs[i];
+                                       dma_chan[j].dma_dev = (void *)&dma_devs[i];
                                } else {
-                                       printk ("WRONG DMA MAP!\n");
+                                       printk(KERN_WARNING "WRONG DMA MAP!\n");
                                }
                        }
                }
@@ -679,32 +625,28 @@ map_dma_chan(_dma_chan_map *map)
        return 0;
 }
 
-void
-dma_chip_init(void)
+void dma_chip_init(void)
 {
        int i;
 
-       // enable DMA from PMU
+       /* enable DMA from PMU */
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_DMA);
 
-       // reset DMA
-       writel(readl(IFXMIPS_DMA_CTRL) | 1, IFXMIPS_DMA_CTRL);
+       /* reset DMA */
+       ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CTRL) | 1, IFXMIPS_DMA_CTRL);
 
-       // diable all interrupts
-       writel(0, IFXMIPS_DMA_IRNEN);
-
-       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-       {
-               writel(i, IFXMIPS_DMA_CS);
-               writel(0x2, IFXMIPS_DMA_CCTRL);
-               writel(0x80000040, IFXMIPS_DMA_CPOLL);
-               writel(readl(IFXMIPS_DMA_CCTRL) & ~0x1, IFXMIPS_DMA_CCTRL);
+       /* disable all interrupts */
+       ifxmips_w32(0, IFXMIPS_DMA_IRNEN);
 
+       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
+               ifxmips_w32(i, IFXMIPS_DMA_CS);
+               ifxmips_w32(0x2, IFXMIPS_DMA_CCTRL);
+               ifxmips_w32(0x80000040, IFXMIPS_DMA_CPOLL);
+               ifxmips_w32(ifxmips_r32(IFXMIPS_DMA_CCTRL) & ~0x1, IFXMIPS_DMA_CCTRL);
        }
 }
 
-int
-ifxmips_dma_init (void)
+int ifxmips_dma_init(void)
 {
        int i;
 
@@ -712,25 +654,23 @@ ifxmips_dma_init (void)
        if (map_dma_chan(default_dma_map))
                BUG();
 
-       g_desc_list = (u64*)KSEG1ADDR(__get_free_page(GFP_DMA));
+       g_desc_list = (u64 *)KSEG1ADDR(__get_free_page(GFP_DMA));
 
-       if (g_desc_list == NULL)
-       {
-               printk("no memory for desriptor\n");
+       if (g_desc_list == NULL) {
+               printk(KERN_WARNING "no memory for desriptor\n");
                return -ENOMEM;
        }
 
        memset(g_desc_list, 0, PAGE_SIZE);
 
-       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-       {
+       for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
                dma_chan[i].desc_base = (u32)g_desc_list + i * IFXMIPS_DMA_DESCRIPTOR_OFFSET * 8;
                dma_chan[i].curr_desc = 0;
                dma_chan[i].desc_len = IFXMIPS_DMA_DESCRIPTOR_OFFSET;
 
-               writel(i, IFXMIPS_DMA_CS);
-               writel((u32)CPHYSADDR(dma_chan[i].desc_base), IFXMIPS_DMA_CDBA);
-               writel(dma_chan[i].desc_len, IFXMIPS_DMA_CDLEN);
+               ifxmips_w32(i, IFXMIPS_DMA_CS);
+               ifxmips_w32((u32)CPHYSADDR(dma_chan[i].desc_base), IFXMIPS_DMA_CDBA);
+               ifxmips_w32(dma_chan[i].desc_len, IFXMIPS_DMA_CDLEN);
        }
 
        return 0;
@@ -738,21 +678,13 @@ ifxmips_dma_init (void)
 
 arch_initcall(ifxmips_dma_init);
 
-void
-dma_cleanup(void)
+void dma_cleanup(void)
 {
        int i;
 
        free_page(KSEG0ADDR((unsigned long) g_desc_list));
        for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++)
-               free_irq(dma_chan[i].irq, (void*)&dma_interrupt);
+               free_irq(dma_chan[i].irq, (void  *)&dma_interrupt);
 }
 
-EXPORT_SYMBOL (dma_device_reserve);
-EXPORT_SYMBOL (dma_device_release);
-EXPORT_SYMBOL (dma_device_register);
-EXPORT_SYMBOL (dma_device_unregister);
-EXPORT_SYMBOL (dma_device_read);
-EXPORT_SYMBOL (dma_device_write);
-
-MODULE_LICENSE ("GPL");
+MODULE_LICENSE("GPL");