Commit af007b02 authored by Romain Perier's avatar Romain Perier Committed by Martin K. Petersen

scsi: be2iscsi: Replace PCI pool old API

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: default avatarRomain Perier <romain.perier@collabora.com>
Acked-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Tested-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent facfc963
...@@ -82,8 +82,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, ...@@ -82,8 +82,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
return NULL; return NULL;
sess = cls_session->dd_data; sess = cls_session->dd_data;
beiscsi_sess = sess->dd_data; beiscsi_sess = sess->dd_data;
beiscsi_sess->bhs_pool = pci_pool_create("beiscsi_bhs_pool", beiscsi_sess->bhs_pool = dma_pool_create("beiscsi_bhs_pool",
phba->pcidev, &phba->pcidev->dev,
sizeof(struct be_cmd_bhs), sizeof(struct be_cmd_bhs),
64, 0); 64, 0);
if (!beiscsi_sess->bhs_pool) if (!beiscsi_sess->bhs_pool)
...@@ -108,7 +108,7 @@ void beiscsi_session_destroy(struct iscsi_cls_session *cls_session) ...@@ -108,7 +108,7 @@ void beiscsi_session_destroy(struct iscsi_cls_session *cls_session)
struct beiscsi_session *beiscsi_sess = sess->dd_data; struct beiscsi_session *beiscsi_sess = sess->dd_data;
printk(KERN_INFO "In beiscsi_session_destroy\n"); 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); iscsi_session_teardown(cls_session);
} }
......
...@@ -4257,7 +4257,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task) ...@@ -4257,7 +4257,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task)
pwrb_context = &phwi_ctrlr->wrb_context[cri_index]; pwrb_context = &phwi_ctrlr->wrb_context[cri_index];
if (io_task->cmd_bhs) { 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->bhs_pa.u.a64.address);
io_task->cmd_bhs = NULL; io_task->cmd_bhs = NULL;
task->hdr = NULL; task->hdr = NULL;
...@@ -4374,7 +4374,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) ...@@ -4374,7 +4374,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess; struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess;
dma_addr_t paddr; 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); GFP_ATOMIC, &paddr);
if (!io_task->cmd_bhs) if (!io_task->cmd_bhs)
return -ENOMEM; return -ENOMEM;
...@@ -4501,7 +4501,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) ...@@ -4501,7 +4501,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
if (io_task->pwrb_handle) if (io_task->pwrb_handle)
free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle); free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle);
io_task->pwrb_handle = NULL; 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->bhs_pa.u.a64.address);
io_task->cmd_bhs = NULL; io_task->cmd_bhs = NULL;
return -ENOMEM; return -ENOMEM;
......
...@@ -438,7 +438,7 @@ struct beiscsi_hba { ...@@ -438,7 +438,7 @@ struct beiscsi_hba {
test_bit(BEISCSI_HBA_ONLINE, &phba->state)) test_bit(BEISCSI_HBA_ONLINE, &phba->state))
struct beiscsi_session { struct beiscsi_session {
struct pci_pool *bhs_pool; struct dma_pool *bhs_pool;
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment