natsemi: switch from 'pci_' to 'dma_' API

[linux-2.6-microblaze.git] / drivers / net / ethernet / natsemi / ns83820.c

diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 8e24c7a..d171b51 100644 (file)
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -526,8 +526,8 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 
        dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;
        cmdsts = REAL_RX_BUF_SIZE | CMDSTS_INTR;
-       buf = pci_map_single(dev->pci_dev, skb->data,
-                            REAL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+       buf = dma_map_single(&dev->pci_dev->dev, skb->data, REAL_RX_BUF_SIZE,
+                            DMA_FROM_DEVICE);
        build_rx_desc(dev, sg, 0, buf, cmdsts, 0);
        /* update link of previous rx */
        if (likely(next_empty != dev->rx_info.next_rx))
@@ -858,8 +858,8 @@ static void rx_irq(struct net_device *ndev)
                mb();
                clear_rx_desc(dev, next_rx);
 
-               pci_unmap_single(dev->pci_dev, bufptr,
-                                RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+               dma_unmap_single(&dev->pci_dev->dev, bufptr, RX_BUF_SIZE,
+                                DMA_FROM_DEVICE);
                len = cmdsts & CMDSTS_LEN_MASK;
 #ifdef NS83820_VLAN_ACCEL_SUPPORT
                /* NH: As was mentioned below, this chip is kinda
@@ -985,17 +985,13 @@ static void do_tx_done(struct net_device *ndev)
                len = cmdsts & CMDSTS_LEN_MASK;
                addr = desc_addr_get(desc + DESC_BUFPTR);
                if (skb) {
-                       pci_unmap_single(dev->pci_dev,
-                                       addr,
-                                       len,
-                                       PCI_DMA_TODEVICE);
+                       dma_unmap_single(&dev->pci_dev->dev, addr, len,
+                                        DMA_TO_DEVICE);
                        dev_consume_skb_irq(skb);
                        atomic_dec(&dev->nr_tx_skbs);
                } else
-                       pci_unmap_page(dev->pci_dev,
-                                       addr,
-                                       len,
-                                       PCI_DMA_TODEVICE);
+                       dma_unmap_page(&dev->pci_dev->dev, addr, len,
+                                      DMA_TO_DEVICE);
 
                tx_done_idx = (tx_done_idx + 1) % NR_TX_DESC;
                dev->tx_done_idx = tx_done_idx;
@@ -1023,10 +1019,10 @@ static void ns83820_cleanup_tx(struct ns83820 *dev)
                dev->tx_skbs[i] = NULL;
                if (skb) {
                        __le32 *desc = dev->tx_descs + (i * DESC_SIZE);
-                       pci_unmap_single(dev->pci_dev,
-                                       desc_addr_get(desc + DESC_BUFPTR),
-                                       le32_to_cpu(desc[DESC_CMDSTS]) & CMDSTS_LEN_MASK,
-                                       PCI_DMA_TODEVICE);
+                       dma_unmap_single(&dev->pci_dev->dev,
+                                        desc_addr_get(desc + DESC_BUFPTR),
+                                        le32_to_cpu(desc[DESC_CMDSTS]) & CMDSTS_LEN_MASK,
+                                        DMA_TO_DEVICE);
                        dev_kfree_skb_irq(skb);
                        atomic_dec(&dev->nr_tx_skbs);
                }
@@ -1121,7 +1117,8 @@ again:
        len = skb->len;
        if (nr_frags)
                len -= skb->data_len;
-       buf = pci_map_single(dev->pci_dev, skb->data, len, PCI_DMA_TODEVICE);
+       buf = dma_map_single(&dev->pci_dev->dev, skb->data, len,
+                            DMA_TO_DEVICE);
 
        first_desc = dev->tx_descs + (free_idx * DESC_SIZE);
 
@@ -1902,12 +1899,12 @@ static int ns83820_init_one(struct pci_dev *pci_dev,
 
        /* See if we can set the dma mask early on; failure is fatal. */
        if (sizeof(dma_addr_t) == 8 &&
-               !pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {
+               !dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64))) {
                using_dac = 1;
-       } else if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
+       } else if (!dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
                using_dac = 0;
        } else {
-               dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");
+               dev_warn(&pci_dev->dev, "dma_set_mask failed!\n");
                return -ENODEV;
        }
 
@@ -1938,10 +1935,12 @@ static int ns83820_init_one(struct pci_dev *pci_dev,
        pci_set_master(pci_dev);
        addr = pci_resource_start(pci_dev, 1);
        dev->base = ioremap(addr, PAGE_SIZE);
-       dev->tx_descs = pci_alloc_consistent(pci_dev,
-                       4 * DESC_SIZE * NR_TX_DESC, &dev->tx_phy_descs);
-       dev->rx_info.descs = pci_alloc_consistent(pci_dev,
-                       4 * DESC_SIZE * NR_RX_DESC, &dev->rx_info.phy_descs);
+       dev->tx_descs = dma_alloc_coherent(&pci_dev->dev,
+                                          4 * DESC_SIZE * NR_TX_DESC,
+                                          &dev->tx_phy_descs, GFP_KERNEL);
+       dev->rx_info.descs = dma_alloc_coherent(&pci_dev->dev,
+                                               4 * DESC_SIZE * NR_RX_DESC,
+                                               &dev->rx_info.phy_descs, GFP_KERNEL);
        err = -ENOMEM;
        if (!dev->base || !dev->tx_descs || !dev->rx_info.descs)
                goto out_disable;
@@ -2183,8 +2182,10 @@ out_free_irq:
 out_disable:
        if (dev->base)
                iounmap(dev->base);
-       pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_TX_DESC, dev->tx_descs, dev->tx_phy_descs);
-       pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_RX_DESC, dev->rx_info.descs, dev->rx_info.phy_descs);
+       dma_free_coherent(&pci_dev->dev, 4 * DESC_SIZE * NR_TX_DESC,
+                         dev->tx_descs, dev->tx_phy_descs);
+       dma_free_coherent(&pci_dev->dev, 4 * DESC_SIZE * NR_RX_DESC,
+                         dev->rx_info.descs, dev->rx_info.phy_descs);
        pci_disable_device(pci_dev);
 out_free:
        free_netdev(ndev);
@@ -2205,10 +2206,10 @@ static void ns83820_remove_one(struct pci_dev *pci_dev)
        unregister_netdev(ndev);
        free_irq(dev->pci_dev->irq, ndev);
        iounmap(dev->base);
-       pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_TX_DESC,
-                       dev->tx_descs, dev->tx_phy_descs);
-       pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_RX_DESC,
-                       dev->rx_info.descs, dev->rx_info.phy_descs);
+       dma_free_coherent(&dev->pci_dev->dev, 4 * DESC_SIZE * NR_TX_DESC,
+                         dev->tx_descs, dev->tx_phy_descs);
+       dma_free_coherent(&dev->pci_dev->dev, 4 * DESC_SIZE * NR_RX_DESC,
+                         dev->rx_info.descs, dev->rx_info.phy_descs);
        pci_disable_device(dev->pci_dev);
        free_netdev(ndev);
 }