lkml.org 
[lkml]   [2017]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 14/15] scsi: pmcraid: Replace PCI pool old API
    Date
    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 a4aadf5f4dc6..0d1f520e4d8a 100644
    --- a/drivers/scsi/pmcraid.c
    +++ b/drivers/scsi/pmcraid.c
    @@ -4658,13 +4658,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;
    }

    @@ -4721,8 +4721,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);

    @@ -4731,7 +4731,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 01eb2bc16dc1..8bfac72a242b 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.11.0
    \
     
     \ /
      Last update: 2017-04-28 16:40    [W:3.316 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site