scsi: mvsas: 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: Romain Perier <romain.perier@collabora.com>
Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 4e047b5001a670ce8038c3b2df2a72ef592b9c74..1d53410334ccdc3d5a4a381529d6e13f5fb121a3 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -125,8 +125,7 @@ static void mvs_free(struct mvs_info *mvi)
        else
                slot_nr = MVS_CHIP_SLOT_SZ;
 
-       if (mvi->dma_pool)
-               pci_pool_destroy(mvi->dma_pool);
+       dma_pool_destroy(mvi->dma_pool);
 
        if (mvi->tx)
                dma_free_coherent(mvi->dev,
@@ -296,7 +295,8 @@ static int mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost)
                goto err_out;
 
        sprintf(pool_name, "%s%d", "mvs_dma_pool", mvi->id);
-       mvi->dma_pool = pci_pool_create(pool_name, mvi->pdev, MVS_SLOT_BUF_SZ, 16, 0);
+       mvi->dma_pool = dma_pool_create(pool_name, &mvi->pdev->dev,
+                                       MVS_SLOT_BUF_SZ, 16, 0);
        if (!mvi->dma_pool) {
                        printk(KERN_DEBUG "failed to create dma pool %s.\n", pool_name);
                        goto err_out;

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index c7cc8035eacb371eb3ae6e038abb6df7c94e7169..ee81d10252e043fa1ed505d429ed7a7dbcebde3d 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -790,7 +790,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf
        slot->n_elem = n_elem;
        slot->slot_tag = tag;
 
-       slot->buf = pci_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);
+       slot->buf = dma_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);
        if (!slot->buf) {
                rc = -ENOMEM;
                goto err_out_tag;
@@ -840,7 +840,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf
        return rc;
 
 err_out_slot_buf:
-       pci_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma);
+       dma_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma);
 err_out_tag:
        mvs_tag_free(mvi, tag);
 err_out:
@@ -918,7 +918,7 @@ static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task,
        }
 
        if (slot->buf) {
-               pci_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma);
+               dma_pool_free(mvi->dma_pool, slot->buf, slot->buf_dma);
                slot->buf = NULL;
        }
        list_del_init(&slot->entry);