Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1604048
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 14/15] scsi: pmcraid: Replace PCI pool old API |
| Date | 2017-03-19 18:20 +0100 |
| Message-ID | <tmMEN-tl-3@gated-at.bofh.it> (permalink) |
| References | <tmMv8-oz-9@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>
Acked-by: Peter Senna Tschudin <peter.senna@collabora.com>
Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
drivers/scsi/pmcraid.c | 10 +++++-----
drivers/scsi/pmcraid.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 49e70a3..0f893c4 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4699,13 +4699,13 @@ pmcraid_release_control_blocks(
return;
for (i = 0; i < max_index; i++) {
- pci_pool_free(pinstance->control_pool,
+ dma_pool_free(pinstance->control_pool,
pinstance->cmd_list[i]->ioa_cb,
pinstance->cmd_list[i]->ioa_cb_bus_addr);
pinstance->cmd_list[i]->ioa_cb = NULL;
pinstance->cmd_list[i]->ioa_cb_bus_addr = 0;
}
- pci_pool_destroy(pinstance->control_pool);
+ dma_pool_destroy(pinstance->control_pool);
pinstance->control_pool = NULL;
}
@@ -4762,8 +4762,8 @@ static int pmcraid_allocate_control_blocks(struct pmcraid_instance *pinstance)
pinstance->host->unique_id);
pinstance->control_pool =
- pci_pool_create(pinstance->ctl_pool_name,
- pinstance->pdev,
+ dma_pool_create(pinstance->ctl_pool_name,
+ &pinstance->pdev->dev,
sizeof(struct pmcraid_control_block),
PMCRAID_IOARCB_ALIGNMENT, 0);
@@ -4772,7 +4772,7 @@ static int pmcraid_allocate_control_blocks(struct pmcraid_instance *pinstance)
for (i = 0; i < PMCRAID_MAX_CMD; i++) {
pinstance->cmd_list[i]->ioa_cb =
- pci_pool_alloc(
+ dma_pool_alloc(
pinstance->control_pool,
GFP_KERNEL,
&(pinstance->cmd_list[i]->ioa_cb_bus_addr));
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 568b18a..acf5a7b 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -755,7 +755,7 @@ struct pmcraid_instance {
/* structures related to command blocks */
struct kmem_cache *cmd_cachep; /* cache for cmd blocks */
- struct pci_pool *control_pool; /* pool for control blocks */
+ struct dma_pool *control_pool; /* pool for control blocks */
char cmd_pool_name[64]; /* name of cmd cache */
char ctl_pool_name[64]; /* name of control cache */
--
2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 00/15] Replace PCI pool by DMA pool API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 10/15] scsi: lpfc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 06/15] mlx5: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
Re: [PATCH v6 06/15] mlx5: Replace PCI pool old API Leon Romanovsky <leon@kernel.org> - 2017-03-20 07:40 +0100
Re: [PATCH v6 06/15] mlx5: Replace PCI pool old API Doug Ledford <dledford@redhat.com> - 2017-03-25 04:50 +0100
[PATCH v6 04/15] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 08/15] scsi: be2iscsi: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 02/15] dmaengine: pch_dma: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 07/15] wireless: ipw2200: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 11/15] scsi: megaraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 13/15] scsi: mvsas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 03/15] IB/mthca: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
Re: [PATCH v6 03/15] IB/mthca: Replace PCI pool old API Doug Ledford <dledford@redhat.com> - 2017-03-25 06:30 +0100
[PATCH v6 12/15] scsi: mpt3sas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 09/15] scsi: csiostor: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 01/15] block: DAC960: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 14/15] scsi: pmcraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:20 +0100
[PATCH v6 15/15] PCI: Remove PCI pool macro functions Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:20 +0100
csiph-web