Commit 18b01b16 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Bjorn Helgaas
Browse files

PCI: Remove pci_unmap_addr() wrappers for DMA API 



Only some of these were still used by the cxgb4 driver, and that despite
the fact that the driver otherwise uses the generic DMA API.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent fa295bec

drivers/infiniband/hw/cxgb4/qp.c

+5 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void dealloc_oc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq) 
static void dealloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)

{

	dma_free_coherent(&(rdev->lldi.pdev->dev), sq->memsize, sq->queue,

			  pci_unmap_addr(sq, mapping));

			  dma_unmap_addr(sq, mapping));

}



static void dealloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
@@ -132,7 +132,7 @@ static int alloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq) 
	if (!sq->queue)

		return -ENOMEM;

	sq->phys_addr = virt_to_phys(sq->queue);

	pci_unmap_addr_set(sq, mapping, sq->dma_addr);

	dma_unmap_addr_set(sq, mapping, sq->dma_addr);

	return 0;

}
@@ -2521,7 +2521,7 @@ static void free_srq_queue(struct c4iw_srq *srq, struct c4iw_dev_ucontext *uctx, 


	dma_free_coherent(&rdev->lldi.pdev->dev,

			  wq->memsize, wq->queue,

			pci_unmap_addr(wq, mapping));

			dma_unmap_addr(wq, mapping));

	c4iw_rqtpool_free(rdev, wq->rqt_hwaddr, wq->rqt_size);

	kfree(wq->sw_rq);

	c4iw_put_qpid(rdev, wq->qid, uctx);
@@ -2570,7 +2570,7 @@ static int alloc_srq_queue(struct c4iw_srq *srq, struct c4iw_dev_ucontext *uctx, 
		goto err_free_rqtpool;



	memset(wq->queue, 0, wq->memsize);

	pci_unmap_addr_set(wq, mapping, wq->dma_addr);

	dma_unmap_addr_set(wq, mapping, wq->dma_addr);



	wq->bar2_va = c4iw_bar2_addrs(rdev, wq->qid, T4_BAR2_QTYPE_EGRESS,

				      &wq->bar2_qid,
@@ -2649,7 +2649,7 @@ static int alloc_srq_queue(struct c4iw_srq *srq, struct c4iw_dev_ucontext *uctx, 
err_free_queue:

	dma_free_coherent(&rdev->lldi.pdev->dev,

			  wq->memsize, wq->queue,

			pci_unmap_addr(wq, mapping));

			dma_unmap_addr(wq, mapping));

err_free_rqtpool:

	c4iw_rqtpool_free(rdev, wq->rqt_hwaddr, wq->rqt_size);

err_free_pending_wrs:

drivers/infiniband/hw/cxgb4/t4.h

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ struct t4_srq_pending_wr { 
struct t4_srq {

	union t4_recv_wr *queue;

	dma_addr_t dma_addr;

	DECLARE_PCI_UNMAP_ADDR(mapping);

	DEFINE_DMA_UNMAP_ADDR(mapping);

	struct t4_swrqe *sw_rq;

	void __iomem *bar2_va;

	u64 bar2_pa;

include/linux/pci-dma.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_PCI_DMA_H

#define _LINUX_PCI_DMA_H



#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DEFINE_DMA_UNMAP_ADDR(ADDR_NAME);

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)   DEFINE_DMA_UNMAP_LEN(LEN_NAME);

#define pci_unmap_addr             dma_unmap_addr

#define pci_unmap_addr_set         dma_unmap_addr_set

#define pci_unmap_len              dma_unmap_len

#define pci_unmap_len_set          dma_unmap_len_set



#endif

include/linux/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,6 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode, 


/* kmem_cache style wrapper around pci_alloc_consistent() */



#include <linux/pci-dma.h>

#include <linux/dmapool.h>



#define	pci_pool dma_pool