提交 13a06405 编写于 作者: R Romain Perier 提交者: Martin K. Petersen

scsi: mpt3sas: 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: NRomain Perier <romain.perier@gmail.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 d9462140
...@@ -3790,12 +3790,12 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) ...@@ -3790,12 +3790,12 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc)
if (ioc->pcie_sgl_dma_pool) { if (ioc->pcie_sgl_dma_pool) {
for (i = 0; i < ioc->scsiio_depth; i++) { for (i = 0; i < ioc->scsiio_depth; i++) {
if (ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl) if (ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl)
pci_pool_free(ioc->pcie_sgl_dma_pool, dma_pool_free(ioc->pcie_sgl_dma_pool,
ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl, ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl,
ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl_dma); ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl_dma);
} }
if (ioc->pcie_sgl_dma_pool) if (ioc->pcie_sgl_dma_pool)
pci_pool_destroy(ioc->pcie_sgl_dma_pool); dma_pool_destroy(ioc->pcie_sgl_dma_pool);
} }
if (ioc->config_page) { if (ioc->config_page) {
...@@ -4204,21 +4204,21 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) ...@@ -4204,21 +4204,21 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc)
sz = nvme_blocks_needed * ioc->page_size; sz = nvme_blocks_needed * ioc->page_size;
ioc->pcie_sgl_dma_pool = ioc->pcie_sgl_dma_pool =
pci_pool_create("PCIe SGL pool", ioc->pdev, sz, 16, 0); dma_pool_create("PCIe SGL pool", &ioc->pdev->dev, sz, 16, 0);
if (!ioc->pcie_sgl_dma_pool) { if (!ioc->pcie_sgl_dma_pool) {
pr_info(MPT3SAS_FMT pr_info(MPT3SAS_FMT
"PCIe SGL pool: pci_pool_create failed\n", "PCIe SGL pool: dma_pool_create failed\n",
ioc->name); ioc->name);
goto out; goto out;
} }
for (i = 0; i < ioc->scsiio_depth; i++) { for (i = 0; i < ioc->scsiio_depth; i++) {
ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl = ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl =
pci_pool_alloc(ioc->pcie_sgl_dma_pool, dma_pool_alloc(ioc->pcie_sgl_dma_pool,
GFP_KERNEL, GFP_KERNEL,
&ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl_dma); &ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl_dma);
if (!ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl) { if (!ioc->scsi_lookup[i].pcie_sg_list.pcie_sgl) {
pr_info(MPT3SAS_FMT pr_info(MPT3SAS_FMT
"PCIe SGL pool: pci_pool_alloc failed\n", "PCIe SGL pool: dma_pool_alloc failed\n",
ioc->name); ioc->name);
goto out; goto out;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册