mlx5: Replace PCI pool old API

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx5 / core / cmd.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index f5a2c605749ff2dad1db091bb93d3b6957fa4058..7a40e8790f7558a6dca08f7432095c9c0ed743b4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -1095,7 +1095,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev,
        if (!mailbox)
                return ERR_PTR(-ENOMEM);
 
-       mailbox->buf = pci_pool_zalloc(dev->cmd.pool, flags,
+       mailbox->buf = dma_pool_zalloc(dev->cmd.pool, flags,
                                       &mailbox->dma);
        if (!mailbox->buf) {
                mlx5_core_dbg(dev, "failed allocation\n");
@@ -1110,7 +1110,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev,
 static void free_cmd_box(struct mlx5_core_dev *dev,
                         struct mlx5_cmd_mailbox *mailbox)
 {
-       pci_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma);
+       dma_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma);
        kfree(mailbox);
 }
 
@@ -1759,7 +1759,8 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
                return -EINVAL;
        }
 
-       cmd->pool = pci_pool_create("mlx5_cmd", dev->pdev, size, align, 0);
+       cmd->pool = dma_pool_create("mlx5_cmd", &dev->pdev->dev, size, align,
+                                   0);
        if (!cmd->pool)
                return -ENOMEM;
 
@@ -1849,7 +1850,7 @@ err_free_page:
        free_cmd_page(dev, cmd);
 
 err_free_pool:
-       pci_pool_destroy(cmd->pool);
+       dma_pool_destroy(cmd->pool);
 
        return err;
 }
@@ -1863,6 +1864,6 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev)
        destroy_workqueue(cmd->wq);
        destroy_msg_cache(dev);
        free_cmd_page(dev, cmd);
-       pci_pool_destroy(cmd->pool);
+       dma_pool_destroy(cmd->pool);
 }
 EXPORT_SYMBOL(mlx5_cmd_cleanup);