atm: remove deprecated use of pci api

Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 28 insertions, 26 deletions

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 4217f29a85e0..924f8e26789d 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1185,8 +1185,8 @@ static int rx_pkt(struct atm_dev *dev)
 
         /* Build the DLE structure */  
         wr_ptr = iadev->rx_dle_q.write;  
-        wr_ptr->sys_pkt_addr = pci_map_single(iadev->pci, skb->data,
-                len, PCI_DMA_FROMDEVICE);
+        wr_ptr->sys_pkt_addr = dma_map_single(&iadev->pci->dev, skb->data,
+                                              len, DMA_FROM_DEVICE);
         wr_ptr->local_pkt_addr = buf_addr;  
         wr_ptr->bytes = len;    /* We don't know this do we ?? */  
         wr_ptr->mode = DMA_INT_ENABLE;  
@@ -1306,8 +1306,8 @@ static void rx_dle_intr(struct atm_dev *dev)
           u_short length;
           struct ia_vcc *ia_vcc;
 
-          pci_unmap_single(iadev->pci, iadev->rx_dle_q.write->sys_pkt_addr,
-                len, PCI_DMA_FROMDEVICE);
+          dma_unmap_single(&iadev->pci->dev, iadev->rx_dle_q.write->sys_pkt_addr,
+                           len, DMA_FROM_DEVICE);
           /* no VCC related housekeeping done as yet. lets see */  
           vcc = ATM_SKB(skb)->vcc;
           if (!vcc) {
@@ -1430,8 +1430,8 @@ static int rx_init(struct atm_dev *dev)
   //    spin_lock_init(&iadev->rx_lock); 
   
         /* Allocate 4k bytes - more aligned than needed (4k boundary) */
-        dle_addr = pci_alloc_consistent(iadev->pci, DLE_TOTAL_SIZE,
-                                        &iadev->rx_dle_dma);  
+        dle_addr = dma_alloc_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE,
+                                      &iadev->rx_dle_dma, GFP_KERNEL);
         if (!dle_addr)  {  
                 printk(KERN_ERR DEV_LABEL "can't allocate DLEs\n");
                 goto err_out;
@@ -1631,8 +1631,8 @@ static int rx_init(struct atm_dev *dev)
         return 0;  
 
 err_free_dle:
-        pci_free_consistent(iadev->pci, DLE_TOTAL_SIZE, iadev->rx_dle_q.start,
-                            iadev->rx_dle_dma);  
+        dma_free_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE, iadev->rx_dle_q.start,
+                          iadev->rx_dle_dma);
 err_out:
         return -ENOMEM;
 }  
@@ -1702,8 +1702,8 @@ static void tx_dle_intr(struct atm_dev *dev)
 
             /* Revenge of the 2 dle (skb + trailer) used in ia_pkt_tx() */
             if (!((dle - iadev->tx_dle_q.start)%(2*sizeof(struct dle)))) {
-                pci_unmap_single(iadev->pci, dle->sys_pkt_addr, skb->len,
-                                 PCI_DMA_TODEVICE);
+                dma_unmap_single(&iadev->pci->dev, dle->sys_pkt_addr, skb->len,
+                                 DMA_TO_DEVICE);
             }
             vcc = ATM_SKB(skb)->vcc;
             if (!vcc) {
@@ -1917,8 +1917,8 @@ static int tx_init(struct atm_dev *dev)
                                 readw(iadev->seg_reg+SEG_MASK_REG));)  
 
         /* Allocate 4k (boundary aligned) bytes */
-        dle_addr = pci_alloc_consistent(iadev->pci, DLE_TOTAL_SIZE,
-                                        &iadev->tx_dle_dma);  
+        dle_addr = dma_alloc_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE,
+                                      &iadev->tx_dle_dma, GFP_KERNEL);
         if (!dle_addr)  {
                 printk(KERN_ERR DEV_LABEL "can't allocate DLEs\n");
                 goto err_out;
@@ -1989,8 +1989,10 @@ static int tx_init(struct atm_dev *dev)
                 goto err_free_tx_bufs;
             }
             iadev->tx_buf[i].cpcs = cpcs;
-            iadev->tx_buf[i].dma_addr = pci_map_single(iadev->pci,
-                cpcs, sizeof(*cpcs), PCI_DMA_TODEVICE);
+            iadev->tx_buf[i].dma_addr = dma_map_single(&iadev->pci->dev,
+                                                       cpcs,
+                                                       sizeof(*cpcs),
+                                                       DMA_TO_DEVICE);
         }
         iadev->desc_tbl = kmalloc(iadev->num_tx_desc *
                                    sizeof(struct desc_tbl_t), GFP_KERNEL);
@@ -2198,14 +2200,14 @@ err_free_tx_bufs:
         while (--i >= 0) {
                 struct cpcs_trailer_desc *desc = iadev->tx_buf + i;
 
-                pci_unmap_single(iadev->pci, desc->dma_addr,
-                        sizeof(*desc->cpcs), PCI_DMA_TODEVICE);
+                dma_unmap_single(&iadev->pci->dev, desc->dma_addr,
+                                 sizeof(*desc->cpcs), DMA_TO_DEVICE);
                 kfree(desc->cpcs);
         }
         kfree(iadev->tx_buf);
 err_free_dle:
-        pci_free_consistent(iadev->pci, DLE_TOTAL_SIZE, iadev->tx_dle_q.start,
-                            iadev->tx_dle_dma);  
+        dma_free_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE, iadev->tx_dle_q.start,
+                          iadev->tx_dle_dma);
 err_out:
         return -ENOMEM;
 }   
@@ -2476,20 +2478,20 @@ static void ia_free_tx(IADEV *iadev)
         for (i = 0; i < iadev->num_tx_desc; i++) {
                 struct cpcs_trailer_desc *desc = iadev->tx_buf + i;
 
-                pci_unmap_single(iadev->pci, desc->dma_addr,
-                        sizeof(*desc->cpcs), PCI_DMA_TODEVICE);
+                dma_unmap_single(&iadev->pci->dev, desc->dma_addr,
+                                 sizeof(*desc->cpcs), DMA_TO_DEVICE);
                 kfree(desc->cpcs);
         }
         kfree(iadev->tx_buf);
-        pci_free_consistent(iadev->pci, DLE_TOTAL_SIZE, iadev->tx_dle_q.start,
-                            iadev->tx_dle_dma);  
+        dma_free_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE, iadev->tx_dle_q.start,
+                          iadev->tx_dle_dma);
 }
 
 static void ia_free_rx(IADEV *iadev)
 {
         kfree(iadev->rx_open);
-        pci_free_consistent(iadev->pci, DLE_TOTAL_SIZE, iadev->rx_dle_q.start,
-                          iadev->rx_dle_dma);  
+        dma_free_coherent(&iadev->pci->dev, DLE_TOTAL_SIZE, iadev->rx_dle_q.start,
+                          iadev->rx_dle_dma);
 }
 
 static int ia_start(struct atm_dev *dev)
@@ -3009,8 +3011,8 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
         /* Build the DLE structure */  
         wr_ptr = iadev->tx_dle_q.write;  
         memset((caddr_t)wr_ptr, 0, sizeof(*wr_ptr));  
-        wr_ptr->sys_pkt_addr = pci_map_single(iadev->pci, skb->data,
-                skb->len, PCI_DMA_TODEVICE);
+        wr_ptr->sys_pkt_addr = dma_map_single(&iadev->pci->dev, skb->data,
+                                              skb->len, DMA_TO_DEVICE);
         wr_ptr->local_pkt_addr = (buf_desc_ptr->buf_start_hi << 16) | 
                                                   buf_desc_ptr->buf_start_lo;  
         /* wr_ptr->bytes = swap_byte_order(total_len); didn't seem to affect?? */