Skip to content

Commit 01d12a6

Browse files
tititiou36gregkh
authored andcommitted
firewire: nosy: switch from 'pci_' to 'dma_' API
The wrappers in include/linux/pci-dma-compat.h should go away. The patch has been generated with the coccinelle script below and has been hand modified to replace GFP_ with a correct flag. It has been compile tested. When memory is allocated in 'add_card()', GFP_KERNEL can be used because this flag is already used a few lines above and no lock is taken in the between. While at it, also remove some useless casting. @@ @@ - PCI_DMA_BIDIRECTIONAL + DMA_BIDIRECTIONAL @@ @@ - PCI_DMA_TODEVICE + DMA_TO_DEVICE @@ @@ - PCI_DMA_FROMDEVICE + DMA_FROM_DEVICE @@ @@ - PCI_DMA_NONE + DMA_NONE @@ expression e1, e2, e3; @@ - pci_alloc_consistent(e1, e2, e3) + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) @@ expression e1, e2, e3; @@ - pci_zalloc_consistent(e1, e2, e3) + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) @@ expression e1, e2, e3, e4; @@ - pci_free_consistent(e1, e2, e3, e4) + dma_free_coherent(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_map_single(e1, e2, e3, e4) + dma_map_single(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_unmap_single(e1, e2, e3, e4) + dma_unmap_single(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4, e5; @@ - pci_map_page(e1, e2, e3, e4, e5) + dma_map_page(&e1->dev, e2, e3, e4, e5) @@ expression e1, e2, e3, e4; @@ - pci_unmap_page(e1, e2, e3, e4) + dma_unmap_page(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_map_sg(e1, e2, e3, e4) + dma_map_sg(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_unmap_sg(e1, e2, e3, e4) + dma_unmap_sg(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_single_for_cpu(e1, e2, e3, e4) + dma_sync_single_for_cpu(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_single_for_device(e1, e2, e3, e4) + dma_sync_single_for_device(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_sg_for_cpu(e1, e2, e3, e4) + dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_sg_for_device(e1, e2, e3, e4) + dma_sync_sg_for_device(&e1->dev, e2, e3, e4) @@ expression e1, e2; @@ - pci_dma_mapping_error(e1, e2) + dma_mapping_error(&e1->dev, e2) @@ expression e1, e2; @@ - pci_set_dma_mask(e1, e2) + dma_set_mask(&e1->dev, e2) @@ expression e1, e2; @@ - pci_set_consistent_dma_mask(e1, e2) + dma_set_coherent_mask(&e1->dev, e2) Signed-off-by: Christophe JAILLET <[email protected]> Link: https://lore.kernel.org/r/e1d7fa558f31abf294659a9d4edcc1e4fc065fab.1623590706.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 36b1fef commit 01d12a6

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

drivers/firewire/nosy.c

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,12 @@ remove_card(struct pci_dev *dev)
511511
wake_up_interruptible(&client->buffer.wait);
512512
spin_unlock_irq(&lynx->client_list_lock);
513513

514-
pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
515-
lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
516-
pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
517-
lynx->rcv_pcl, lynx->rcv_pcl_bus);
518-
pci_free_consistent(lynx->pci_device, PAGE_SIZE,
519-
lynx->rcv_buffer, lynx->rcv_buffer_bus);
514+
dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
515+
lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
516+
dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
517+
lynx->rcv_pcl, lynx->rcv_pcl_bus);
518+
dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE, lynx->rcv_buffer,
519+
lynx->rcv_buffer_bus);
520520

521521
iounmap(lynx->registers);
522522
pci_disable_device(dev);
@@ -532,7 +532,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
532532
u32 p, end;
533533
int ret, i;
534534

535-
if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
535+
if (dma_set_mask(&dev->dev, DMA_BIT_MASK(32))) {
536536
dev_err(&dev->dev,
537537
"DMA address limits not supported for PCILynx hardware\n");
538538
return -ENXIO;
@@ -564,12 +564,16 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
564564
goto fail_deallocate_lynx;
565565
}
566566

567-
lynx->rcv_start_pcl = pci_alloc_consistent(lynx->pci_device,
568-
sizeof(struct pcl), &lynx->rcv_start_pcl_bus);
569-
lynx->rcv_pcl = pci_alloc_consistent(lynx->pci_device,
570-
sizeof(struct pcl), &lynx->rcv_pcl_bus);
571-
lynx->rcv_buffer = pci_alloc_consistent(lynx->pci_device,
572-
RCV_BUFFER_SIZE, &lynx->rcv_buffer_bus);
567+
lynx->rcv_start_pcl = dma_alloc_coherent(&lynx->pci_device->dev,
568+
sizeof(struct pcl),
569+
&lynx->rcv_start_pcl_bus,
570+
GFP_KERNEL);
571+
lynx->rcv_pcl = dma_alloc_coherent(&lynx->pci_device->dev,
572+
sizeof(struct pcl),
573+
&lynx->rcv_pcl_bus, GFP_KERNEL);
574+
lynx->rcv_buffer = dma_alloc_coherent(&lynx->pci_device->dev,
575+
RCV_BUFFER_SIZE,
576+
&lynx->rcv_buffer_bus, GFP_KERNEL);
573577
if (lynx->rcv_start_pcl == NULL ||
574578
lynx->rcv_pcl == NULL ||
575579
lynx->rcv_buffer == NULL) {
@@ -667,14 +671,15 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
667671

668672
fail_deallocate_buffers:
669673
if (lynx->rcv_start_pcl)
670-
pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
671-
lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
674+
dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
675+
lynx->rcv_start_pcl,
676+
lynx->rcv_start_pcl_bus);
672677
if (lynx->rcv_pcl)
673-
pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
674-
lynx->rcv_pcl, lynx->rcv_pcl_bus);
678+
dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
679+
lynx->rcv_pcl, lynx->rcv_pcl_bus);
675680
if (lynx->rcv_buffer)
676-
pci_free_consistent(lynx->pci_device, PAGE_SIZE,
677-
lynx->rcv_buffer, lynx->rcv_buffer_bus);
681+
dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE,
682+
lynx->rcv_buffer, lynx->rcv_buffer_bus);
678683
iounmap(lynx->registers);
679684

680685
fail_deallocate_lynx:

0 commit comments

Comments
 (0)