Skip to content

Commit

Permalink
scsi: pmcraid: Replace PCI pool old API
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Romain Perier authored and Martin K. Petersen committed Aug 7, 2017
1 parent 4dbd671 commit a7ec87a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/scsi/pmcraid.c
Original file line number Diff line number Diff line change
Expand Up @@ -4655,13 +4655,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;
}

Expand Down Expand Up @@ -4718,8 +4718,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);

Expand All @@ -4728,7 +4728,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));
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/pmcraid.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit a7ec87a

Please sign in to comment.