Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1632934
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v8 06/15] mlx5: Replace PCI pool old API |
| Date | 2017-04-28 16:40 +0200 |
| Message-ID | <tBfdT-av-7@gated-at.bofh.it> (permalink) |
| References | <tBf4d-6x-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The PCI pool API is deprecated. This commit replaces the PCI pool old
API by the appropriate function with the DMA pool API.
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com>
Acked-by: Doug Ledford <dledford@redhat.com>
Tested-by: Doug Ledford <dledford@redhat.com>
---
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++-----
include/linux/mlx5/driver.h | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 5bdaf3d545b2..aae7d9207ff3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -1069,7 +1069,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");
@@ -1084,7 +1084,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);
}
@@ -1704,7 +1704,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;
@@ -1794,7 +1795,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
free_cmd_page(dev, cmd);
err_free_pool:
- pci_pool_destroy(cmd->pool);
+ dma_pool_destroy(cmd->pool);
return err;
}
@@ -1808,6 +1809,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);
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 6cd000f30921..7ea19aeebffc 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -284,7 +284,7 @@ struct mlx5_cmd {
struct semaphore pages_sem;
int mode;
struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS];
- struct pci_pool *pool;
+ struct dma_pool *pool;
struct mlx5_cmd_debug dbg;
struct cmd_msg_cache cache[MLX5_NUM_COMMAND_CACHES];
int checksum_disabled;
--
2.11.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v8 00/15] Replace PCI pool by DMA pool API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 01/15] block: DAC960: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 14/15] scsi: pmcraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 10/15] scsi: lpfc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 07/15] wireless: ipw2200: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 09/15] scsi: csiostor: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:30 +0200 [PATCH v8 05/15] mlx4: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 06/15] mlx5: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 04/15] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 08/15] scsi: be2iscsi: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 12/15] scsi: mpt3sas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 11/15] scsi: megaraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 03/15] IB/mthca: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200 [PATCH v8 02/15] dmaengine: pch_dma: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-04-28 16:40 +0200
csiph-web