4 files changed, 47 insertions, 72 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index dfe542b206cc..0a9f12c4e911 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -43,7 +43,6 @@ MODULE_AUTHOR("Holger Smolinski <Holger.Smolinski@de.ibm.com>");
 MODULE_DESCRIPTION("Linux on S/390 DASD device driver,"
                    " Copyright 2000 IBM Corporation");
 MODULE_SUPPORTED_DEVICE("dasd");
-MODULE_PARM(dasd, "1-" __MODULE_STRING(256) "s");
 MODULE_LICENSE("GPL");
 
 /*
@@ -542,9 +541,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         struct dasd_ccw_req *cqr;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
         if (cqr == NULL)
@@ -584,9 +582,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
         int size;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
         if (cplength > 0)
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f576f243cd93..c1c6f1381150 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -16,6 +16,7 @@
 #include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/init.h>
+#include <linux/module.h>
 
 #include <asm/debug.h>
 #include <asm/uaccess.h>
@@ -69,6 +70,8 @@ int dasd_autodetect = 0;	/* is true, when autodetection is active */
  * strings when running as a module.
  */
 static char *dasd[256];
+module_param_array(dasd, charp, NULL, 0);
+
 /*
  * Single spinlock to protect devmap structures and lists.
  */
@@ -434,8 +437,7 @@ dasd_forget_ranges(void)
         spin_lock(&dasd_devmap_lock);
         for (i = 0; i < 256; i++) {
                 list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
-                        if (devmap->device != NULL)
-                                BUG();
+                        BUG_ON(devmap->device != NULL);
                         list_del(&devmap->list);
                         kfree(devmap);
                 }
@@ -544,8 +546,7 @@ dasd_delete_device(struct dasd_device *device)
 
         /* First remove device pointer from devmap. */
         devmap = dasd_find_busid(device->cdev->dev.bus_id);
-        if (IS_ERR(devmap))
-                BUG();
+        BUG_ON(IS_ERR(devmap));
         spin_lock(&dasd_devmap_lock);
         if (devmap->device != device) {
                 spin_unlock(&dasd_devmap_lock);
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index bd06607a5dcc..eecb2afad5c2 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -28,6 +28,7 @@
 #include <linux/major.h>
 #include <linux/kdev_t.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 
 struct class *class3270;
 
@@ -59,7 +60,7 @@ struct raw3270 {
 #define RAW3270_FLAGS_CONSOLE   8       /* Device is the console. */
 
 /* Semaphore to protect global data of raw3270 (devices, views, etc). */
-static DECLARE_MUTEX(raw3270_sem);
+static DEFINE_MUTEX(raw3270_mutex);
 
 /* List of 3270 devices. */
 static struct list_head raw3270_devices = LIST_HEAD_INIT(raw3270_devices);
@@ -815,7 +816,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
          * number for it. Note: there is no device with minor 0,
          * see special case for fs3270.c:fs3270_open().
          */
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         /* Keep the list sorted. */
         minor = RAW3270_FIRSTMINOR;
         rp->minor = -1;
@@ -832,7 +833,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
                 rp->minor = minor;
                 list_add_tail(&rp->list, &raw3270_devices);
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         /* No free minor number? Then give up. */
         if (rp->minor == -1)
                 return -EUSERS;
@@ -1003,7 +1004,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
 
         if (minor <= 0)
                 return -ENODEV;
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         rc = -ENODEV;
         list_for_each_entry(rp, &raw3270_devices, list) {
                 if (rp->minor != minor)
@@ -1024,7 +1025,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
                 spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
                 break;
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return rc;
 }
 
@@ -1038,7 +1039,7 @@ raw3270_find_view(struct raw3270_fn *fn, int minor)
         struct raw3270_view *view, *tmp;
         unsigned long flags;
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         view = ERR_PTR(-ENODEV);
         list_for_each_entry(rp, &raw3270_devices, list) {
                 if (rp->minor != minor)
@@ -1057,7 +1058,7 @@ raw3270_find_view(struct raw3270_fn *fn, int minor)
                 spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
                 break;
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return view;
 }
 
@@ -1104,7 +1105,7 @@ raw3270_delete_device(struct raw3270 *rp)
         struct ccw_device *cdev;
 
         /* Remove from device chain. */
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         if (rp->clttydev)
                 class_device_destroy(class3270,
                                      MKDEV(IBM_TTY3270_MAJOR, rp->minor));
@@ -1112,7 +1113,7 @@ raw3270_delete_device(struct raw3270 *rp)
                 class_device_destroy(class3270,
                                      MKDEV(IBM_FS3270_MAJOR, rp->minor));
         list_del_init(&rp->list);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 
         /* Disconnect from ccw_device. */
         cdev = rp->cdev;
@@ -1208,13 +1209,13 @@ int raw3270_register_notifier(void (*notifier)(int, int))
         if (!np)
                 return -ENOMEM;
         np->notifier = notifier;
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_add_tail(&np->list, &raw3270_notifier);
         list_for_each_entry(rp, &raw3270_devices, list) {
                 get_device(&rp->cdev->dev);
                 notifier(rp->minor, 1);
         }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return 0;
 }
 
@@ -1222,14 +1223,14 @@ void raw3270_unregister_notifier(void (*notifier)(int, int))
 {
         struct raw3270_notifier *np;
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 if (np->notifier == notifier) {
                         list_del(&np->list);
                         kfree(np);
                         break;
                 }
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 }
 
 /*
@@ -1256,10 +1257,10 @@ raw3270_set_online (struct ccw_device *cdev)
                 goto failure;
         raw3270_create_attributes(rp);
         set_bit(RAW3270_FLAGS_READY, &rp->flags);
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 np->notifier(rp->minor, 1);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
         return 0;
 
 failure:
@@ -1307,10 +1308,10 @@ raw3270_remove (struct ccw_device *cdev)
         }
         spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
 
-        down(&raw3270_sem);
+        mutex_lock(&raw3270_mutex);
         list_for_each_entry(np, &raw3270_notifier, list)
                 np->notifier(rp->minor, 0);
-        up(&raw3270_sem);
+        mutex_unlock(&raw3270_mutex);
 
         /* Reset 3270 device. */
         raw3270_reset_device(rp);
@@ -1370,13 +1371,13 @@ raw3270_init(void)
         rc = ccw_driver_register(&raw3270_ccw_driver);
         if (rc == 0) {
                 /* Create attributes for early (= console) device. */
-                down(&raw3270_sem);
+                mutex_lock(&raw3270_mutex);
                 class3270 = class_create(THIS_MODULE, "3270");
                 list_for_each_entry(rp, &raw3270_devices, list) {
                         get_device(&rp->cdev->dev);
                         raw3270_create_attributes(rp);
                 }
-                up(&raw3270_sem);
+                mutex_unlock(&raw3270_mutex);
         }
         return rc;
 }
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 95b92f317b6f..395cfc6a344f 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -829,18 +829,6 @@ zfcp_unit_dequeue(struct zfcp_unit *unit)
         device_unregister(&unit->sysfs_device);
 }
 
-static void *
-zfcp_mempool_alloc(gfp_t gfp_mask, void *size)
-{
-        return kmalloc((size_t) size, gfp_mask);
-}
-
-static void
-zfcp_mempool_free(void *element, void *size)
-{
-        kfree(element);
-}
-
 /*
  * Allocates a combined QTCB/fsf_req buffer for erp actions and fcp/SCSI
  * commands.
@@ -853,51 +841,39 @@ static int
 zfcp_allocate_low_mem_buffers(struct zfcp_adapter *adapter)
 {
         adapter->pool.fsf_req_erp =
-                mempool_create(ZFCP_POOL_FSF_REQ_ERP_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_erp)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_ERP_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_erp)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_scsi =
-                mempool_create(ZFCP_POOL_FSF_REQ_SCSI_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_scsi)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_SCSI_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_scsi)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_abort =
-                mempool_create(ZFCP_POOL_FSF_REQ_ABORT_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_fsf_req_pool_element));
-
-        if (NULL == adapter->pool.fsf_req_abort)
+                mempool_create_kmalloc_pool(ZFCP_POOL_FSF_REQ_ABORT_NR,
+                                sizeof(struct zfcp_fsf_req_pool_element));
+        if (!adapter->pool.fsf_req_abort)
                 return -ENOMEM;
 
         adapter->pool.fsf_req_status_read =
-                mempool_create(ZFCP_POOL_STATUS_READ_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free,
-                               (void *) sizeof(struct zfcp_fsf_req));
-
-        if (NULL == adapter->pool.fsf_req_status_read)
+                mempool_create_kmalloc_pool(ZFCP_POOL_STATUS_READ_NR,
+                                            sizeof(struct zfcp_fsf_req));
+        if (!adapter->pool.fsf_req_status_read)
                 return -ENOMEM;
 
         adapter->pool.data_status_read =
-                mempool_create(ZFCP_POOL_STATUS_READ_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free,
-                               (void *) sizeof(struct fsf_status_read_buffer));
-
-        if (NULL == adapter->pool.data_status_read)
+                mempool_create_kmalloc_pool(ZFCP_POOL_STATUS_READ_NR,
+                                        sizeof(struct fsf_status_read_buffer));
+        if (!adapter->pool.data_status_read)
                 return -ENOMEM;
 
         adapter->pool.data_gid_pn =
-                mempool_create(ZFCP_POOL_DATA_GID_PN_NR,
-                               zfcp_mempool_alloc, zfcp_mempool_free, (void *)
-                               sizeof(struct zfcp_gid_pn_data));
-
-        if (NULL == adapter->pool.data_gid_pn)
+                mempool_create_kmalloc_pool(ZFCP_POOL_DATA_GID_PN_NR,
+                                            sizeof(struct zfcp_gid_pn_data));
+        if (!adapter->pool.data_gid_pn)
                 return -ENOMEM;
 
         return 0;