lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/mthca: Use the dma state API instead of pci equivalents

Browse Source 
The DMA API is preferred; no functional change.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
FUJITA Tomonori
2010-04-02 04:29:39 +00:00
committed by Roland Dreier
parent 0eddb519b9
commit 3a2baff783
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/hw/mthca/mthca_allocator.c
View File

@@ -211,7 +211,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
if (!buf->direct.buf) if (!buf->direct.buf)
return -ENOMEM; return -ENOMEM;
pci_unmap_addr_set(&buf->direct, mapping, t); dma_unmap_addr_set(&buf->direct, mapping, t);
memset(buf->direct.buf, 0, size); memset(buf->direct.buf, 0, size);
@@ -251,7 +251,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
goto err_free; goto err_free;
dma_list[i] = t; dma_list[i] = t;
pci_unmap_addr_set(&buf->page_list[i], mapping, t); dma_unmap_addr_set(&buf->page_list[i], mapping, t);
clear_page(buf->page_list[i].buf); clear_page(buf->page_list[i].buf);
} }
@@ -289,12 +289,12 @@ void mthca_buf_free(struct mthca_dev *dev, int size, union mthca_buf *buf,
if (is_direct) if (is_direct)
dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf, dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf,
pci_unmap_addr(&buf->direct, mapping)); dma_unmap_addr(&buf->direct, mapping));
else { else {
for (i = 0; i < (size + PAGE_SIZE - 1) / PAGE_SIZE; ++i) for (i = 0; i < (size + PAGE_SIZE - 1) / PAGE_SIZE; ++i)
dma_free_coherent(&dev->pdev->dev, PAGE_SIZE, dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
buf->page_list[i].buf, buf->page_list[i].buf,
pci_unmap_addr(&buf->page_list[i], dma_unmap_addr(&buf->page_list[i],
mapping)); mapping));
kfree(buf->page_list); kfree(buf->page_list);
} }

6
drivers/infiniband/hw/mthca/mthca_eq.c
View File

@@ -504,7 +504,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
goto err_out_free_pages; goto err_out_free_pages;
dma_list[i] = t; dma_list[i] = t;
pci_unmap_addr_set(&eq->page_list[i], mapping, t); dma_unmap_addr_set(&eq->page_list[i], mapping, t);
clear_page(eq->page_list[i].buf); clear_page(eq->page_list[i].buf);
} }
@@ -579,7 +579,7 @@ static int mthca_create_eq(struct mthca_dev *dev,
if (eq->page_list[i].buf) if (eq->page_list[i].buf)
dma_free_coherent(&dev->pdev->dev, PAGE_SIZE, dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
eq->page_list[i].buf, eq->page_list[i].buf,
pci_unmap_addr(&eq->page_list[i], dma_unmap_addr(&eq->page_list[i],
mapping)); mapping));
mthca_free_mailbox(dev, mailbox); mthca_free_mailbox(dev, mailbox);
@@ -629,7 +629,7 @@ static void mthca_free_eq(struct mthca_dev *dev,
for (i = 0; i < npages; ++i) for (i = 0; i < npages; ++i)
pci_free_consistent(dev->pdev, PAGE_SIZE, pci_free_consistent(dev->pdev, PAGE_SIZE,
eq->page_list[i].buf, eq->page_list[i].buf,
pci_unmap_addr(&eq->page_list[i], mapping)); dma_unmap_addr(&eq->page_list[i], mapping));
kfree(eq->page_list); kfree(eq->page_list);
mthca_free_mailbox(dev, mailbox); mthca_free_mailbox(dev, mailbox);

2
drivers/infiniband/hw/mthca/mthca_provider.h
View File

@@ -46,7 +46,7 @@
struct mthca_buf_list { struct mthca_buf_list {
void *buf; void *buf;
DECLARE_PCI_UNMAP_ADDR(mapping) DEFINE_DMA_UNMAP_ADDR(mapping);
}; };
union mthca_buf { union mthca_buf {