Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB: Fix world-writable child interface control sysfs attributes
  IB/qib: Clean up properly if qib_init() fails
  IB/qib: Completion queue callback needs to be single threaded
  IB/qib: Update 7322 serdes tables
  IB/qib: Clear 6120 hardware error register
  IB/qib: Clear eager buffer memory for each new process
  IB/qib: Mask hardware error during link reset
  IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem
  RDMA/cxgb4: Derive smac_idx from port viid
  RDMA/cxgb4: Avoid false GTS CIDX_INC overflows
  RDMA/cxgb4: Don't call abort_connection() for active connect failures
  RDMA/cxgb4: Use the DMA state API instead of the pci equivalents

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 0c28ed1eafa6..7065cb310553 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -40,10 +40,10 @@ static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
          */
         dma_free_coherent(&(rdev->lldi.pdev->dev),
                           wq->rq.memsize, wq->rq.queue,
-                          pci_unmap_addr(&wq->rq, mapping));
+                          dma_unmap_addr(&wq->rq, mapping));
         dma_free_coherent(&(rdev->lldi.pdev->dev),
                           wq->sq.memsize, wq->sq.queue,
-                          pci_unmap_addr(&wq->sq, mapping));
+                          dma_unmap_addr(&wq->sq, mapping));
         c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
         kfree(wq->rq.sw_rq);
         kfree(wq->sq.sw_sq);
@@ -99,7 +99,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         if (!wq->sq.queue)
                 goto err5;
         memset(wq->sq.queue, 0, wq->sq.memsize);
-        pci_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
+        dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
         wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),
                                           wq->rq.memsize, &(wq->rq.dma_addr),
@@ -112,7 +112,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                 wq->rq.queue,
                 (unsigned long long)virt_to_phys(wq->rq.queue));
         memset(wq->rq.queue, 0, wq->rq.memsize);
-        pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
+        dma_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
 
         wq->db = rdev->lldi.db_reg;
         wq->gts = rdev->lldi.gts_reg;
@@ -217,11 +217,11 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
 err7:
         dma_free_coherent(&(rdev->lldi.pdev->dev),
                           wq->rq.memsize, wq->rq.queue,
-                          pci_unmap_addr(&wq->rq, mapping));
+                          dma_unmap_addr(&wq->rq, mapping));
 err6:
         dma_free_coherent(&(rdev->lldi.pdev->dev),
                           wq->sq.memsize, wq->sq.queue,
-                          pci_unmap_addr(&wq->sq, mapping));
+                          dma_unmap_addr(&wq->sq, mapping));
 err5:
         c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
 err4: