@@ -511,12 +511,12 @@ remove_card(struct pci_dev *dev)
511
511
wake_up_interruptible (& client -> buffer .wait );
512
512
spin_unlock_irq (& lynx -> client_list_lock );
513
513
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 );
520
520
521
521
iounmap (lynx -> registers );
522
522
pci_disable_device (dev );
@@ -532,7 +532,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
532
532
u32 p , end ;
533
533
int ret , i ;
534
534
535
- if (pci_set_dma_mask ( dev , DMA_BIT_MASK (32 ))) {
535
+ if (dma_set_mask ( & dev -> dev , DMA_BIT_MASK (32 ))) {
536
536
dev_err (& dev -> dev ,
537
537
"DMA address limits not supported for PCILynx hardware\n" );
538
538
return - ENXIO ;
@@ -564,12 +564,16 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
564
564
goto fail_deallocate_lynx ;
565
565
}
566
566
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 );
573
577
if (lynx -> rcv_start_pcl == NULL ||
574
578
lynx -> rcv_pcl == NULL ||
575
579
lynx -> rcv_buffer == NULL ) {
@@ -667,14 +671,15 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
667
671
668
672
fail_deallocate_buffers :
669
673
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 );
672
677
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 );
675
680
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 );
678
683
iounmap (lynx -> registers );
679
684
680
685
fail_deallocate_lynx :
0 commit comments