6 files changed, 71 insertions, 51 deletions

diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index c46d9520c5a7..73c6b85299c1 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -794,7 +794,9 @@ static void drain_rx_pools (amb_dev * dev) {
     drain_rx_pool (dev, pool);
 }
 
-static inline void fill_rx_pool (amb_dev * dev, unsigned char pool, int priority) {
+static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,
+                                 unsigned int __nocast priority)
+{
   rx_in rx;
   amb_rxq * rxq;
   
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 101f0cc33d10..b078fa548ebf 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1374,7 +1374,8 @@ static void reset_chip (struct fs_dev *dev)
         }
 }
 
-static void __devinit *aligned_kmalloc (int size, int flags, int alignment)
+static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags,
+                                        int alignment)
 {
         void  *t;
 
@@ -1464,7 +1465,8 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f
    does. I've seen "receive abort: no buffers" and things started
    working again after that...  -- REW */
 
-static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags)
+static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
+                        unsigned int __nocast gfp_flags)
 {
         struct FS_BPENTRY *qe, *ne;
         struct sk_buff *skb;
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index df2c83fd5496..28250c9b32d6 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -57,7 +57,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/pci.h>
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index baaf1a3d2242..30b7e990ed0b 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -46,6 +46,7 @@ static char const rcsid[] =
 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/wait.h>
+#include <linux/jiffies.h>
 #include <asm/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -780,7 +781,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb)
         return 0;
 
 out:
-        if (jiffies - scq->trans_start > HZ) {
+        if (time_after(jiffies, scq->trans_start + HZ)) {
                 printk("%s: Error pushing TBD for %d.%d\n",
                        card->name, vc->tx_vcc->vpi, vc->tx_vcc->vci);
 #ifdef CONFIG_ATM_IDT77252_DEBUG
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 8d5e65cb9755..a2b236a966e0 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -16,9 +16,9 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
-#include <linux/ioport.h> /* for request_region */
 #include <linux/uio.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 #include <linux/atm_zatm.h>
 #include <linux/capability.h>
 #include <linux/bitops.h>
@@ -1257,22 +1257,22 @@ static int __init zatm_init(struct atm_dev *dev)
 
 static int __init zatm_start(struct atm_dev *dev)
 {
-        struct zatm_dev *zatm_dev;
+        struct zatm_dev *zatm_dev = ZATM_DEV(dev);
+        struct pci_dev *pdev = zatm_dev->pci_dev;
         unsigned long curr;
         int pools,vccs,rx;
-        int error,i,ld;
+        int error, i, ld;
 
         DPRINTK("zatm_start\n");
-        zatm_dev = ZATM_DEV(dev);
         zatm_dev->rx_map = zatm_dev->tx_map = NULL;
-        for (i = 0; i < NR_MBX; i++)
-                zatm_dev->mbx_start[i] = 0;
-        if (request_irq(zatm_dev->irq,&zatm_int,SA_SHIRQ,DEV_LABEL,dev)) {
-                printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
-                    dev->number,zatm_dev->irq);
-                return -EAGAIN;
+        for (i = 0; i < NR_MBX; i++)
+                zatm_dev->mbx_start[i] = 0;
+        error = request_irq(zatm_dev->irq, zatm_int, SA_SHIRQ, DEV_LABEL, dev);
+        if (error < 0) {
+                printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
+                    dev->number,zatm_dev->irq);
+                goto done;
         }
-        request_region(zatm_dev->base,uPD98401_PORTS,DEV_LABEL);
         /* define memory regions */
         pools = NR_POOLS;
         if (NR_SHAPERS*SHAPER_SIZE > pools*POOL_SIZE)
@@ -1299,51 +1299,66 @@ static int __init zatm_start(struct atm_dev *dev)
             "%ld VCs\n",dev->number,NR_SHAPERS,pools,rx,
             (zatm_dev->mem-curr*4)/VC_SIZE);
         /* create mailboxes */
-        for (i = 0; i < NR_MBX; i++)
-                if (mbx_entries[i]) {
-                        unsigned long here;
-
-                        here = (unsigned long) kmalloc(2*MBX_SIZE(i),
-                            GFP_KERNEL);
-                        if (!here) {
-                                error = -ENOMEM;
-                                goto out;
-                        }
-                        if ((here^(here+MBX_SIZE(i))) & ~0xffffUL)/* paranoia */
-                                here = (here & ~0xffffUL)+0x10000;
-                        zatm_dev->mbx_start[i] = here;
-                        if ((here^virt_to_bus((void *) here)) & 0xffff) {
-                                printk(KERN_ERR DEV_LABEL "(itf %d): system "
-                                    "bus incompatible with driver\n",
-                                    dev->number);
-                                error = -ENODEV;
-                                goto out;
-                        }
-                        DPRINTK("mbx@0x%08lx-0x%08lx\n",here,here+MBX_SIZE(i));
-                        zatm_dev->mbx_end[i] = (here+MBX_SIZE(i)) & 0xffff;
-                        zout(virt_to_bus((void *) here) >> 16,MSH(i));
-                        zout(virt_to_bus((void *) here),MSL(i));
-                        zout((here+MBX_SIZE(i)) & 0xffff,MBA(i));
-                        zout(here & 0xffff,MTA(i));
-                        zout(here & 0xffff,MWA(i));
+        for (i = 0; i < NR_MBX; i++) {
+                void *mbx;
+                dma_addr_t mbx_dma;
+
+                if (!mbx_entries[i])
+                        continue;
+                mbx = pci_alloc_consistent(pdev, 2*MBX_SIZE(i), &mbx_dma);
+                if (!mbx) {
+                        error = -ENOMEM;
+                        goto out;
                 }
+                /*
+                 * Alignment provided by pci_alloc_consistent() isn't enough
+                 * for this device.
+                 */
+                if (((unsigned long)mbx ^ mbx_dma) & 0xffff) {
+                        printk(KERN_ERR DEV_LABEL "(itf %d): system "
+                               "bus incompatible with driver\n", dev->number);
+                        pci_free_consistent(pdev, 2*MBX_SIZE(i), mbx, mbx_dma);
+                        error = -ENODEV;
+                        goto out;
+                }
+                DPRINTK("mbx@0x%08lx-0x%08lx\n", mbx, mbx + MBX_SIZE(i));
+                zatm_dev->mbx_start[i] = (unsigned long)mbx;
+                zatm_dev->mbx_dma[i] = mbx_dma;
+                zatm_dev->mbx_end[i] = (zatm_dev->mbx_start[i] + MBX_SIZE(i)) &
+                                        0xffff;
+                zout(mbx_dma >> 16, MSH(i));
+                zout(mbx_dma, MSL(i));
+                zout(zatm_dev->mbx_end[i], MBA(i));
+                zout((unsigned long)mbx & 0xffff, MTA(i));
+                zout((unsigned long)mbx & 0xffff, MWA(i));
+        }
         error = start_tx(dev);
-        if (error) goto out;
+        if (error)
+                goto out;
         error = start_rx(dev);
-        if (error) goto out;
+        if (error)
+                goto out_tx;
         error = dev->phy->start(dev);
-        if (error) goto out;
+        if (error)
+                goto out_rx;
         zout(0xffffffff,IMR); /* enable interrupts */
         /* enable TX & RX */
         zout(zin(GMR) | uPD98401_GMR_SE | uPD98401_GMR_RE,GMR);
-        return 0;
-    out:
-        for (i = 0; i < NR_MBX; i++)
-                kfree(zatm_dev->mbx_start[i]);
+done:
+        return error;
+
+out_rx:
         kfree(zatm_dev->rx_map);
+out_tx:
         kfree(zatm_dev->tx_map);
+out:
+        while (i-- > 0) {
+                pci_free_consistent(pdev, 2*MBX_SIZE(i), 
+                                    (void *)zatm_dev->mbx_start[i],
+                                    zatm_dev->mbx_dma[i]);
+        }
         free_irq(zatm_dev->irq, dev);
-        return error;
+        goto done;
 }
 
 
diff --git a/drivers/atm/zatm.h b/drivers/atm/zatm.h
index 34a0480f63d6..416fe0fda60c 100644
--- a/drivers/atm/zatm.h
+++ b/drivers/atm/zatm.h
@@ -73,6 +73,7 @@ struct zatm_dev {
         int chans;                      /* map size, must be 2^n */
         /*-------------------------------- mailboxes */
         unsigned long mbx_start[NR_MBX];/* start addresses */
+        dma_addr_t mbx_dma[NR_MBX];
         u16 mbx_end[NR_MBX];            /* end offset (in bytes) */
         /*-------------------------------- other pointers */
         u32 pool_base;                  /* Free buffer pool dsc (word addr) */