7 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 1c0d7578e791..b8c6810090d5 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -462,7 +462,7 @@ static int asd_create_global_caches(void)
                                             sizeof(struct asd_dma_tok),
                                             0,
                                             SLAB_HWCACHE_ALIGN,
-                                            NULL, NULL);
+                                            NULL);
                 if (!asd_dma_token_cache) {
                         asd_printk("couldn't create dma token cache\n");
                         return -ENOMEM;
@@ -474,7 +474,7 @@ static int asd_create_global_caches(void)
                                                    sizeof(struct asd_ascb),
                                                    0,
                                                    SLAB_HWCACHE_ALIGN,
-                                                   NULL, NULL);
+                                                   NULL);
                 if (!asd_ascb_cache) {
                         asd_printk("couldn't create ascb cache\n");
                         goto Err;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 965698c8b7bf..1396c83b0c9c 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(sas_domain_release_transport);
 static int __init sas_class_init(void)
 {
         sas_task_cache = kmem_cache_create("sas_task", sizeof(struct sas_task),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         if (!sas_task_cache)
                 return -ENOMEM;
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b5a77b0c0deb..92376f9dfdd5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2723,7 +2723,7 @@ qla2x00_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
-            SLAB_HWCACHE_ALIGN, NULL, NULL);
+            SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                     "qla2xxx: Unable to allocate SRB cache...Failing load!\n");
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index e69160a7bc60..b1d565c12c5b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1677,7 +1677,7 @@ static int __init qla4xxx_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
-                                       SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                       SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                        "%s: Unable to allocate SRB cache..."
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index a691dda40d2c..a5de1a829a76 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -288,7 +288,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
         if (!pool->users) {
                 pool->slab = kmem_cache_create(pool->name,
                                 sizeof(struct scsi_cmnd), 0,
-                                pool->slab_flags, NULL, NULL);
+                                pool->slab_flags, NULL);
                 if (!pool->slab)
                         goto fail;
         }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1f5a07bf2a75..da63c544919b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1661,7 +1661,7 @@ int __init scsi_init_queue(void)
 
         scsi_io_context_cache = kmem_cache_create("scsi_io_context",
                                         sizeof(struct scsi_io_context),
-                                        0, 0, NULL, NULL);
+                                        0, 0, NULL);
         if (!scsi_io_context_cache) {
                 printk(KERN_ERR "SCSI: can't init scsi io context cache\n");
                 return -ENOMEM;
@@ -1672,7 +1672,7 @@ int __init scsi_init_queue(void)
                 int size = sgp->size * sizeof(struct scatterlist);
 
                 sgp->slab = kmem_cache_create(sgp->name, size, 0,
-                                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN, NULL);
                 if (!sgp->slab) {
                         printk(KERN_ERR "SCSI: can't init sg slab %s\n",
                                         sgp->name);
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 2570f48a69c7..371b69c110bc 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -585,7 +585,7 @@ static int __init scsi_tgt_init(void)
 
         scsi_tgt_cmd_cache = kmem_cache_create("scsi_tgt_cmd",
                                                sizeof(struct scsi_tgt_cmd),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
         if (!scsi_tgt_cmd_cache)
                 return -ENOMEM;