Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / drivers / isdn / hardware / avm / b1dma.c

diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 4d64e5c..428872b 100644 (file)
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
@@ -30,7 +29,7 @@
 
 static char *revision = "$Revision: 1.1.2.3 $";
 
-#undef CONFIG_B1DMA_DEBUG
+#undef AVM_B1DMA_DEBUG
 
 /* ------------------------------------------------------------- */
 
@@ -392,20 +391,21 @@ static void b1dma_dispatch_tx(avmcard *card)
                        _put_slice(&p, skb->data, len);
                }
                txlen = (u8 *)p - (u8 *)dma->sendbuf.dmabuf;
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef AVM_B1DMA_DEBUG
                printk(KERN_DEBUG "tx: put msg len=%d\n", txlen);
 #endif
        } else {
                txlen = skb->len-2;
-#ifdef CONFIG_B1DMA_POLLDEBUG
+#ifdef AVM_B1DMA_POLLDEBUG
                if (skb->data[2] == SEND_POLLACK)
                        printk(KERN_INFO "%s: send ack\n", card->name);
 #endif
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef AVM_B1DMA_DEBUG
                printk(KERN_DEBUG "tx: put 0x%x len=%d\n", 
                       skb->data[2], txlen);
 #endif
-               memcpy(dma->sendbuf.dmabuf, skb->data+2, skb->len-2);
+               skb_copy_from_linear_data_offset(skb, 2, dma->sendbuf.dmabuf,
+                                                skb->len - 2);
        }
        txlen = (txlen + 3) & ~3;
 
@@ -451,7 +451,7 @@ static void b1dma_handle_rx(avmcard *card)
        u32 ApplId, MsgLen, DataB3Len, NCCI, WindowSize;
        u8 b1cmd =  _get_byte(&p);
 
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef AVM_B1DMA_DEBUG
        printk(KERN_DEBUG "rx: 0x%x %lu\n", b1cmd, (unsigned long)dma->recvlen);
 #endif
        
@@ -516,7 +516,7 @@ static void b1dma_handle_rx(avmcard *card)
                break;
 
        case RECEIVE_START:
-#ifdef CONFIG_B1DMA_POLLDEBUG
+#ifdef AVM_B1DMA_POLLDEBUG
                printk(KERN_INFO "%s: receive poll\n", card->name);
 #endif
                if (!suppress_pollack)
@@ -602,7 +602,7 @@ static void b1dma_handle_interrupt(avmcard *card)
                                rxlen = (dma->recvlen + 3) & ~3;
                                b1dma_writel(card, dma->recvbuf.dmaaddr+4, AMCC_RXPTR);
                                b1dma_writel(card, rxlen, AMCC_RXLEN);
-#ifdef CONFIG_B1DMA_DEBUG
+#ifdef AVM_B1DMA_DEBUG
                        } else {
                                printk(KERN_ERR "%s: rx not complete (%d).\n",
                                        card->name, rxlen);
@@ -629,7 +629,7 @@ static void b1dma_handle_interrupt(avmcard *card)
        spin_unlock(&card->lock);
 }
 
-irqreturn_t b1dma_interrupt(int interrupt, void *devptr, struct pt_regs *regs)
+irqreturn_t b1dma_interrupt(int interrupt, void *devptr)
 {
        avmcard *card = devptr;