atm: remove deprecated use of pci api

[firefly-linux-kernel-4.4.55.git] / drivers / atm / nicstar.c

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 9988ac98b6d83ee58fa2774f1c4ced4559dcee74..b7e1cc0a97c86aac6c47cb5d459f63313a9beb45 100644 (file)
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -252,10 +252,10 @@ static void nicstar_remove_one(struct pci_dev *pcidev)
                        free_scq(card, card->scd2vc[j]->scq, card->scd2vc[j]->tx_vcc);
        }
        idr_destroy(&card->idr);
-       pci_free_consistent(card->pcidev, NS_RSQSIZE + NS_RSQ_ALIGNMENT,
-                           card->rsq.org, card->rsq.dma);
-       pci_free_consistent(card->pcidev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
-                           card->tsq.org, card->tsq.dma);
+       dma_free_coherent(&card->pcidev->dev, NS_RSQSIZE + NS_RSQ_ALIGNMENT,
+                         card->rsq.org, card->rsq.dma);
+       dma_free_coherent(&card->pcidev->dev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,
+                         card->tsq.org, card->tsq.dma);
        free_irq(card->pcidev->irq, card);
        iounmap(card->membase);
        kfree(card);
@@ -370,8 +370,7 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
                ns_init_card_error(card, error);
                return error;
        }
-        if ((pci_set_dma_mask(pcidev, DMA_BIT_MASK(32)) != 0) ||
-           (pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32)) != 0)) {
+        if (dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32)) != 0) {
                 printk(KERN_WARNING
                       "nicstar%d: No suitable DMA available.\n", i);
                error = 2;
@@ -535,9 +534,9 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
        writel(0x00000000, card->membase + VPM);
 
        /* Initialize TSQ */
-       card->tsq.org = pci_alloc_consistent(card->pcidev,
-                                            NS_TSQSIZE + NS_TSQ_ALIGNMENT,
-                                            &card->tsq.dma);
+       card->tsq.org = dma_alloc_coherent(&card->pcidev->dev,
+                                          NS_TSQSIZE + NS_TSQ_ALIGNMENT,
+                                          &card->tsq.dma, GFP_KERNEL);
        if (card->tsq.org == NULL) {
                printk("nicstar%d: can't allocate TSQ.\n", i);
                error = 10;
@@ -554,9 +553,9 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
        PRINTK("nicstar%d: TSQ base at 0x%p.\n", i, card->tsq.base);
 
        /* Initialize RSQ */
-       card->rsq.org = pci_alloc_consistent(card->pcidev,
-                                            NS_RSQSIZE + NS_RSQ_ALIGNMENT,
-                                            &card->rsq.dma);
+       card->rsq.org = dma_alloc_coherent(&card->pcidev->dev,
+                                          NS_RSQSIZE + NS_RSQ_ALIGNMENT,
+                                          &card->rsq.dma, GFP_KERNEL);
        if (card->rsq.org == NULL) {
                printk("nicstar%d: can't allocate RSQ.\n", i);
                error = 11;
@@ -874,7 +873,8 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd)
        scq = kmalloc(sizeof(scq_info), GFP_KERNEL);
        if (!scq)
                return NULL;
-        scq->org = pci_alloc_consistent(card->pcidev, 2 * size, &scq->dma);
+        scq->org = dma_alloc_coherent(&card->pcidev->dev,
+                                     2 * size,  &scq->dma, GFP_KERNEL);
        if (!scq->org) {
                kfree(scq);
                return NULL;
@@ -936,10 +936,10 @@ static void free_scq(ns_dev *card, scq_info *scq, struct atm_vcc *vcc)
                        }
        }
        kfree(scq->skb);
-       pci_free_consistent(card->pcidev,
-                           2 * (scq->num_entries == VBR_SCQ_NUM_ENTRIES ?
-                                VBR_SCQSIZE : CBR_SCQSIZE),
-                           scq->org, scq->dma);
+       dma_free_coherent(&card->pcidev->dev,
+                         2 * (scq->num_entries == VBR_SCQ_NUM_ENTRIES ?
+                              VBR_SCQSIZE : CBR_SCQSIZE),
+                         scq->org, scq->dma);
        kfree(scq);
 }
 
@@ -957,11 +957,11 @@ static void push_rxbufs(ns_dev * card, struct sk_buff *skb)
        handle2 = NULL;
        addr2 = 0;
        handle1 = skb;
-       addr1 = pci_map_single(card->pcidev,
+       addr1 = dma_map_single(&card->pcidev->dev,
                               skb->data,
                               (NS_PRV_BUFTYPE(skb) == BUF_SM
                                ? NS_SMSKBSIZE : NS_LGSKBSIZE),
-                              PCI_DMA_TODEVICE);
+                              DMA_TO_DEVICE);
        NS_PRV_DMA(skb) = addr1; /* save so we can unmap later */
 
 #ifdef GENERAL_DEBUG
@@ -1670,8 +1670,8 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
 
        ATM_SKB(skb)->vcc = vcc;
 
-       NS_PRV_DMA(skb) = pci_map_single(card->pcidev, skb->data,
-                                        skb->len, PCI_DMA_TODEVICE);
+       NS_PRV_DMA(skb) = dma_map_single(&card->pcidev->dev, skb->data,
+                                        skb->len, DMA_TO_DEVICE);
 
        if (vcc->qos.aal == ATM_AAL5) {
                buflen = (skb->len + 47 + 8) / 48 * 48; /* Multiple of 48 */
@@ -1930,10 +1930,10 @@ static void drain_scq(ns_dev * card, scq_info * scq, int pos)
                XPRINTK("nicstar%d: freeing skb at 0x%p (index %d).\n",
                        card->index, skb, i);
                if (skb != NULL) {
-                       pci_unmap_single(card->pcidev,
+                       dma_unmap_single(&card->pcidev->dev,
                                         NS_PRV_DMA(skb),
                                         skb->len,
-                                        PCI_DMA_TODEVICE);
+                                        DMA_TO_DEVICE);
                        vcc = ATM_SKB(skb)->vcc;
                        if (vcc && vcc->pop != NULL) {
                                vcc->pop(vcc, skb);
@@ -1992,16 +1992,16 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
                return;
        }
        idr_remove(&card->idr, id);
-        pci_dma_sync_single_for_cpu(card->pcidev,
-                                   NS_PRV_DMA(skb),
-                                   (NS_PRV_BUFTYPE(skb) == BUF_SM
-                                    ? NS_SMSKBSIZE : NS_LGSKBSIZE),
-                                   PCI_DMA_FROMDEVICE);
-       pci_unmap_single(card->pcidev,
+       dma_sync_single_for_cpu(&card->pcidev->dev,
+                               NS_PRV_DMA(skb),
+                               (NS_PRV_BUFTYPE(skb) == BUF_SM
+                                ? NS_SMSKBSIZE : NS_LGSKBSIZE),
+                               DMA_FROM_DEVICE);
+       dma_unmap_single(&card->pcidev->dev,
                         NS_PRV_DMA(skb),
                         (NS_PRV_BUFTYPE(skb) == BUF_SM
                          ? NS_SMSKBSIZE : NS_LGSKBSIZE),
-                        PCI_DMA_FROMDEVICE);
+                        DMA_FROM_DEVICE);
        vpi = ns_rsqe_vpi(rsqe);
        vci = ns_rsqe_vci(rsqe);
        if (vpi >= 1UL << card->vpibits || vci >= 1UL << card->vcibits) {