Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx5 / core / pagealloc.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index c0e18f2..1506388 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -238,7 +238,7 @@ static void free_fwp(struct mlx5_core_dev *dev, struct fw_page *fwp,
        rb_erase(&fwp->rb_node, root);
        if (in_free_list)
                list_del(&fwp->list);
-       dma_unmap_page(dev->device, fwp->addr & MLX5_U64_4K_PAGE_MASK,
+       dma_unmap_page(mlx5_core_dma_dev(dev), fwp->addr & MLX5_U64_4K_PAGE_MASK,
                       PAGE_SIZE, DMA_BIDIRECTIONAL);
        __free_page(fwp->page);
        kfree(fwp);
@@ -265,7 +265,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 func_id)
 
 static int alloc_system_page(struct mlx5_core_dev *dev, u16 func_id)
 {
-       struct device *device = dev->device;
+       struct device *device = mlx5_core_dma_dev(dev);
        int nid = dev_to_node(device);
        struct page *page;
        u64 zero_addr = 1;