vme: switch from 'pci_' to 'dma_' API

[linux-2.6-microblaze.git] / drivers / vme / bridges / vme_ca91cx42.c

diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index ea938dc..439b0ed 100644 (file)
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -1510,7 +1510,7 @@ static void *ca91cx42_alloc_consistent(struct device *parent, size_t size,
        /* Find pci_dev container of dev */
        pdev = to_pci_dev(parent);
 
-       return pci_alloc_consistent(pdev, size, dma);
+       return dma_alloc_coherent(&pdev->dev, size, dma, GFP_KERNEL);
 }
 
 static void ca91cx42_free_consistent(struct device *parent, size_t size,
@@ -1521,7 +1521,7 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
        /* Find pci_dev container of dev */
        pdev = to_pci_dev(parent);
 
-       pci_free_consistent(pdev, size, vaddr, dma);
+       dma_free_coherent(&pdev->dev, size, vaddr, dma);
 }
 
 /*
@@ -1555,8 +1555,9 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
        }
 
        /* Allocate mem for CR/CSR image */
-       bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
-                                                    &bridge->crcsr_bus);
+       bridge->crcsr_kernel = dma_alloc_coherent(&pdev->dev,
+                                                 VME_CRCSR_BUF_SIZE,
+                                                 &bridge->crcsr_bus, GFP_KERNEL);
        if (!bridge->crcsr_kernel) {
                dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
                        "image\n");
@@ -1589,8 +1590,8 @@ static void ca91cx42_crcsr_exit(struct vme_bridge *ca91cx42_bridge,
        /* Free image */
        iowrite32(0, bridge->base + VCSR_TO);
 
-       pci_free_consistent(pdev, VME_CRCSR_BUF_SIZE, bridge->crcsr_kernel,
-               bridge->crcsr_bus);
+       dma_free_coherent(&pdev->dev, VME_CRCSR_BUF_SIZE,
+                         bridge->crcsr_kernel, bridge->crcsr_bus);
 }
 
 static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)