hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/net/ethernet/dec/tulip/interrupt.c
....@@ -74,8 +74,8 @@
7474 if (skb == NULL)
7575 break;
7676
77
- mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ,
78
- PCI_DMA_FROMDEVICE);
77
+ mapping = dma_map_single(&tp->pdev->dev, skb->data,
78
+ PKT_BUF_SZ, DMA_FROM_DEVICE);
7979 if (dma_mapping_error(&tp->pdev->dev, mapping)) {
8080 dev_kfree_skb(skb);
8181 tp->rx_buffers[entry].skb = NULL;
....@@ -210,9 +210,10 @@
210210 if (pkt_len < tulip_rx_copybreak &&
211211 (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
212212 skb_reserve(skb, 2); /* 16 byte align the IP header */
213
- pci_dma_sync_single_for_cpu(tp->pdev,
214
- tp->rx_buffers[entry].mapping,
215
- pkt_len, PCI_DMA_FROMDEVICE);
213
+ dma_sync_single_for_cpu(&tp->pdev->dev,
214
+ tp->rx_buffers[entry].mapping,
215
+ pkt_len,
216
+ DMA_FROM_DEVICE);
216217 #if ! defined(__alpha__)
217218 skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
218219 pkt_len);
....@@ -222,9 +223,10 @@
222223 tp->rx_buffers[entry].skb->data,
223224 pkt_len);
224225 #endif
225
- pci_dma_sync_single_for_device(tp->pdev,
226
- tp->rx_buffers[entry].mapping,
227
- pkt_len, PCI_DMA_FROMDEVICE);
226
+ dma_sync_single_for_device(&tp->pdev->dev,
227
+ tp->rx_buffers[entry].mapping,
228
+ pkt_len,
229
+ DMA_FROM_DEVICE);
228230 } else { /* Pass up the skb already on the Rx ring. */
229231 char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
230232 pkt_len);
....@@ -240,8 +242,10 @@
240242 }
241243 #endif
242244
243
- pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
244
- PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
245
+ dma_unmap_single(&tp->pdev->dev,
246
+ tp->rx_buffers[entry].mapping,
247
+ PKT_BUF_SZ,
248
+ DMA_FROM_DEVICE);
245249
246250 tp->rx_buffers[entry].skb = NULL;
247251 tp->rx_buffers[entry].mapping = 0;
....@@ -436,9 +440,10 @@
436440 if (pkt_len < tulip_rx_copybreak &&
437441 (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
438442 skb_reserve(skb, 2); /* 16 byte align the IP header */
439
- pci_dma_sync_single_for_cpu(tp->pdev,
440
- tp->rx_buffers[entry].mapping,
441
- pkt_len, PCI_DMA_FROMDEVICE);
443
+ dma_sync_single_for_cpu(&tp->pdev->dev,
444
+ tp->rx_buffers[entry].mapping,
445
+ pkt_len,
446
+ DMA_FROM_DEVICE);
442447 #if ! defined(__alpha__)
443448 skb_copy_to_linear_data(skb, tp->rx_buffers[entry].skb->data,
444449 pkt_len);
....@@ -448,9 +453,10 @@
448453 tp->rx_buffers[entry].skb->data,
449454 pkt_len);
450455 #endif
451
- pci_dma_sync_single_for_device(tp->pdev,
452
- tp->rx_buffers[entry].mapping,
453
- pkt_len, PCI_DMA_FROMDEVICE);
456
+ dma_sync_single_for_device(&tp->pdev->dev,
457
+ tp->rx_buffers[entry].mapping,
458
+ pkt_len,
459
+ DMA_FROM_DEVICE);
454460 } else { /* Pass up the skb already on the Rx ring. */
455461 char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
456462 pkt_len);
....@@ -466,8 +472,9 @@
466472 }
467473 #endif
468474
469
- pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
470
- PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
475
+ dma_unmap_single(&tp->pdev->dev,
476
+ tp->rx_buffers[entry].mapping,
477
+ PKT_BUF_SZ, DMA_FROM_DEVICE);
471478
472479 tp->rx_buffers[entry].skb = NULL;
473480 tp->rx_buffers[entry].mapping = 0;
....@@ -597,10 +604,10 @@
597604 if (tp->tx_buffers[entry].skb == NULL) {
598605 /* test because dummy frames not mapped */
599606 if (tp->tx_buffers[entry].mapping)
600
- pci_unmap_single(tp->pdev,
601
- tp->tx_buffers[entry].mapping,
602
- sizeof(tp->setup_frame),
603
- PCI_DMA_TODEVICE);
607
+ dma_unmap_single(&tp->pdev->dev,
608
+ tp->tx_buffers[entry].mapping,
609
+ sizeof(tp->setup_frame),
610
+ DMA_TO_DEVICE);
604611 continue;
605612 }
606613
....@@ -629,9 +636,10 @@
629636 dev->stats.tx_packets++;
630637 }
631638
632
- pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
639
+ dma_unmap_single(&tp->pdev->dev,
640
+ tp->tx_buffers[entry].mapping,
633641 tp->tx_buffers[entry].skb->len,
634
- PCI_DMA_TODEVICE);
642
+ DMA_TO_DEVICE);
635643
636644 /* Free the original skb. */
637645 dev_kfree_skb_irq(tp->tx_buffers[entry].skb);