lkml.org 
[lkml]   [2017]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 08/19] scsi: be2iscsi: 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/be2iscsi/be_iscsi.c | 6 +++---
    drivers/scsi/be2iscsi/be_main.c | 6 +++---
    drivers/scsi/be2iscsi/be_main.h | 2 +-
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
    index a484457..d76ef77 100644
    --- a/drivers/scsi/be2iscsi/be_iscsi.c
    +++ b/drivers/scsi/be2iscsi/be_iscsi.c
    @@ -87,8 +87,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
    return NULL;
    sess = cls_session->dd_data;
    beiscsi_sess = sess->dd_data;
    - beiscsi_sess->bhs_pool = pci_pool_create("beiscsi_bhs_pool",
    - phba->pcidev,
    + beiscsi_sess->bhs_pool = dma_pool_create("beiscsi_bhs_pool",
    + &phba->pcidev->dev,
    sizeof(struct be_cmd_bhs),
    64, 0);
    if (!beiscsi_sess->bhs_pool)
    @@ -113,7 +113,7 @@ void beiscsi_session_destroy(struct iscsi_cls_session *cls_session)
    struct beiscsi_session *beiscsi_sess = sess->dd_data;

    printk(KERN_INFO "In beiscsi_session_destroy\n");
    - pci_pool_destroy(beiscsi_sess->bhs_pool);
    + dma_pool_destroy(beiscsi_sess->bhs_pool);
    iscsi_session_teardown(cls_session);
    }

    diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
    index 32b2713..dd43480 100644
    --- a/drivers/scsi/be2iscsi/be_main.c
    +++ b/drivers/scsi/be2iscsi/be_main.c
    @@ -4307,7 +4307,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task)
    pwrb_context = &phwi_ctrlr->wrb_context[cri_index];

    if (io_task->cmd_bhs) {
    - pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
    + dma_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
    io_task->bhs_pa.u.a64.address);
    io_task->cmd_bhs = NULL;
    task->hdr = NULL;
    @@ -4424,7 +4424,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
    struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess;
    dma_addr_t paddr;

    - io_task->cmd_bhs = pci_pool_alloc(beiscsi_sess->bhs_pool,
    + io_task->cmd_bhs = dma_pool_alloc(beiscsi_sess->bhs_pool,
    GFP_ATOMIC, &paddr);
    if (!io_task->cmd_bhs)
    return -ENOMEM;
    @@ -4551,7 +4551,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
    if (io_task->pwrb_handle)
    free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle);
    io_task->pwrb_handle = NULL;
    - pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
    + dma_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
    io_task->bhs_pa.u.a64.address);
    io_task->cmd_bhs = NULL;
    return -ENOMEM;
    diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
    index 2188579..cf58d31 100644
    --- a/drivers/scsi/be2iscsi/be_main.h
    +++ b/drivers/scsi/be2iscsi/be_main.h
    @@ -446,7 +446,7 @@ struct beiscsi_hba {
    test_bit(BEISCSI_HBA_ONLINE, &phba->state))

    struct beiscsi_session {
    - struct pci_pool *bhs_pool;
    + struct dma_pool *bhs_pool;
    };

    /**
    --
    2.9.3
    \
     
     \ /
      Last update: 2017-03-08 17:25    [W:9.214 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site