Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / drivers / firewire / nosy.c

diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index 88ed971..b0d671d 100644 (file)
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -511,12 +511,12 @@ remove_card(struct pci_dev *dev)
                wake_up_interruptible(&client->buffer.wait);
        spin_unlock_irq(&lynx->client_list_lock);
 
-       pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
-                           lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
-       pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
-                           lynx->rcv_pcl, lynx->rcv_pcl_bus);
-       pci_free_consistent(lynx->pci_device, PAGE_SIZE,
-                           lynx->rcv_buffer, lynx->rcv_buffer_bus);
+       dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
+                         lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
+       dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
+                         lynx->rcv_pcl, lynx->rcv_pcl_bus);
+       dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE, lynx->rcv_buffer,
+                         lynx->rcv_buffer_bus);
 
        iounmap(lynx->registers);
        pci_disable_device(dev);
@@ -532,7 +532,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
        u32 p, end;
        int ret, i;
 
-       if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) {
+       if (dma_set_mask(&dev->dev, DMA_BIT_MASK(32))) {
                dev_err(&dev->dev,
                    "DMA address limits not supported for PCILynx hardware\n");
                return -ENXIO;
@@ -564,12 +564,16 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
                goto fail_deallocate_lynx;
        }
 
-       lynx->rcv_start_pcl = pci_alloc_consistent(lynx->pci_device,
-                               sizeof(struct pcl), &lynx->rcv_start_pcl_bus);
-       lynx->rcv_pcl = pci_alloc_consistent(lynx->pci_device,
-                               sizeof(struct pcl), &lynx->rcv_pcl_bus);
-       lynx->rcv_buffer = pci_alloc_consistent(lynx->pci_device,
-                               RCV_BUFFER_SIZE, &lynx->rcv_buffer_bus);
+       lynx->rcv_start_pcl = dma_alloc_coherent(&lynx->pci_device->dev,
+                                                sizeof(struct pcl),
+                                                &lynx->rcv_start_pcl_bus,
+                                                GFP_KERNEL);
+       lynx->rcv_pcl = dma_alloc_coherent(&lynx->pci_device->dev,
+                                          sizeof(struct pcl),
+                                          &lynx->rcv_pcl_bus, GFP_KERNEL);
+       lynx->rcv_buffer = dma_alloc_coherent(&lynx->pci_device->dev,
+                                             RCV_BUFFER_SIZE,
+                                             &lynx->rcv_buffer_bus, GFP_KERNEL);
        if (lynx->rcv_start_pcl == NULL ||
            lynx->rcv_pcl == NULL ||
            lynx->rcv_buffer == NULL) {
@@ -667,14 +671,15 @@ fail_free_irq:
 
 fail_deallocate_buffers:
        if (lynx->rcv_start_pcl)
-               pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
-                               lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus);
+               dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
+                                 lynx->rcv_start_pcl,
+                                 lynx->rcv_start_pcl_bus);
        if (lynx->rcv_pcl)
-               pci_free_consistent(lynx->pci_device, sizeof(struct pcl),
-                               lynx->rcv_pcl, lynx->rcv_pcl_bus);
+               dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl),
+                                 lynx->rcv_pcl, lynx->rcv_pcl_bus);
        if (lynx->rcv_buffer)
-               pci_free_consistent(lynx->pci_device, PAGE_SIZE,
-                               lynx->rcv_buffer, lynx->rcv_buffer_bus);
+               dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE,
+                                 lynx->rcv_buffer, lynx->rcv_buffer_bus);
        iounmap(lynx->registers);
 
 fail_deallocate_lynx: