Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/scsi/be2iscsi/be_iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -82,8 +82,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)
@@ -108,7 +108,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);

}

drivers/scsi/be2iscsi/be_main.c

+3 −3
Original line number Diff line number Diff line
@@ -4257,7 +4257,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;
@@ -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;

	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;
@@ -4501,7 +4501,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;

drivers/scsi/be2iscsi/be_main.h

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ struct beiscsi_hba { 
	 test_bit(BEISCSI_HBA_ONLINE, &phba->state))



struct beiscsi_session {

	struct pci_pool *bhs_pool;

	struct dma_pool *bhs_pool;

};



/**