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

[pandora-kernel.git] / drivers / infiniband / hw / mthca / mthca_allocator.c

diff --git a/drivers/infiniband/hw/mthca/mthca_allocator.c b/drivers/infiniband/hw/mthca/mthca_allocator.c
index a763067..b4e0cf4 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
@@ -28,8 +28,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id: mthca_allocator.c 1349 2004-12-16 21:09:43Z roland $
  */
 
 #include <linux/errno.h>
@@ -213,7 +211,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
                if (!buf->direct.buf)
                        return -ENOMEM;
 
-               pci_unmap_addr_set(&buf->direct, mapping, t);
+               dma_unmap_addr_set(&buf->direct, mapping, t);
 
                memset(buf->direct.buf, 0, size);
 
@@ -253,7 +251,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
                                goto err_free;
 
                        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);
                }
@@ -291,12 +289,12 @@ void mthca_buf_free(struct mthca_dev *dev, int size, union mthca_buf *buf,
 
        if (is_direct)
                dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf,
-                                 pci_unmap_addr(&buf->direct, mapping));
+                                 dma_unmap_addr(&buf->direct, mapping));
        else {
                for (i = 0; i < (size + PAGE_SIZE - 1) / PAGE_SIZE; ++i)
                        dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
                                          buf->page_list[i].buf,
-                                         pci_unmap_addr(&buf->page_list[i],
+                                         dma_unmap_addr(&buf->page_list[i],
                                                         mapping));
                kfree(buf->page_list);
        }