1 files changed, 4 insertions, 17 deletions

diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index bb63f1a1f808..fc98eb61e760 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -388,17 +388,6 @@ static void fnic_iounmap(struct fnic *fnic)
                 iounmap(fnic->bar0.vaddr);
 }
 
-/*
- * Allocate element for mempools requiring GFP_DMA flag.
- * Otherwise, checks in kmem_flagcheck() hit BUG_ON().
- */
-static void *fnic_alloc_slab_dma(gfp_t gfp_mask, void *pool_data)
-{
-        struct kmem_cache *mem = pool_data;
-
-        return kmem_cache_alloc(mem, gfp_mask | GFP_ATOMIC | GFP_DMA);
-}
-
 /**
  * fnic_get_mac() - get assigned data MAC address for FIP code.
  * @lport:      local port.
@@ -603,14 +592,12 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
         if (!fnic->io_req_pool)
                 goto err_out_free_resources;
 
-        pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,
-                              fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
+        pool = mempool_create_slab_pool(2, fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]);
         if (!pool)
                 goto err_out_free_ioreq_pool;
         fnic->io_sgl_pool[FNIC_SGL_CACHE_DFLT] = pool;
 
-        pool = mempool_create(2, fnic_alloc_slab_dma, mempool_free_slab,
-                              fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);
+        pool = mempool_create_slab_pool(2, fnic_sgl_cache[FNIC_SGL_CACHE_MAX]);
         if (!pool)
                 goto err_out_free_dflt_pool;
         fnic->io_sgl_pool[FNIC_SGL_CACHE_MAX] = pool;
@@ -876,7 +863,7 @@ static int __init fnic_init_module(void)
         len = sizeof(struct fnic_dflt_sgl_list);
         fnic_sgl_cache[FNIC_SGL_CACHE_DFLT] = kmem_cache_create
                 ("fnic_sgl_dflt", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,
-                 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,
+                 SLAB_HWCACHE_ALIGN,
                  NULL);
         if (!fnic_sgl_cache[FNIC_SGL_CACHE_DFLT]) {
                 printk(KERN_ERR PFX "failed to create fnic dflt sgl slab\n");
@@ -888,7 +875,7 @@ static int __init fnic_init_module(void)
         len = sizeof(struct fnic_sgl_list);
         fnic_sgl_cache[FNIC_SGL_CACHE_MAX] = kmem_cache_create
                 ("fnic_sgl_max", len + FNIC_SG_DESC_ALIGN, FNIC_SG_DESC_ALIGN,
-                 SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA,
+                 SLAB_HWCACHE_ALIGN,
                  NULL);
         if (!fnic_sgl_cache[FNIC_SGL_CACHE_MAX]) {
                 printk(KERN_ERR PFX "failed to create fnic max sgl slab\n");