Merge branch 'kvm-sev-move-context' into kvm-master

[linux-2.6-microblaze.git] / drivers / misc / genwqe / card_utils.c

diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c
index 039b923..1167463 100644 (file)
--- a/drivers/misc/genwqe/card_utils.c
+++ b/drivers/misc/genwqe/card_utils.c
@@ -233,8 +233,8 @@ static void genwqe_unmap_pages(struct genwqe_dev *cd, dma_addr_t *dma_list,
        struct pci_dev *pci_dev = cd->pci_dev;
 
        for (i = 0; (i < num_pages) && (dma_list[i] != 0x0); i++) {
-               pci_unmap_page(pci_dev, dma_list[i],
-                              PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+               dma_unmap_page(&pci_dev->dev, dma_list[i], PAGE_SIZE,
+                              DMA_BIDIRECTIONAL);
                dma_list[i] = 0x0;
        }
 }
@@ -251,12 +251,12 @@ static int genwqe_map_pages(struct genwqe_dev *cd,
                dma_addr_t daddr;
 
                dma_list[i] = 0x0;
-               daddr = pci_map_page(pci_dev, page_list[i],
+               daddr = dma_map_page(&pci_dev->dev, page_list[i],
                                     0,  /* map_offs */
                                     PAGE_SIZE,
-                                    PCI_DMA_BIDIRECTIONAL);  /* FIXME rd/rw */
+                                    DMA_BIDIRECTIONAL);  /* FIXME rd/rw */
 
-               if (pci_dma_mapping_error(pci_dev, daddr)) {
+               if (dma_mapping_error(&pci_dev->dev, daddr)) {
                        dev_err(&pci_dev->dev,
                                "[%s] err: no dma addr daddr=%016llx!\n",
                                __func__, (long long)daddr);