[PATCH] s390: kzalloc() conversion in drivers/s390

Convert all kmalloc + memset sequences in drivers/s390 to kzalloc usage.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 5 insertions, 10 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index f32f7447588..dfe542b206c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -71,10 +71,9 @@ dasd_alloc_device(void)
 {
         struct dasd_device *device;
 
-        device = kmalloc(sizeof (struct dasd_device), GFP_ATOMIC);
+        device = kzalloc(sizeof (struct dasd_device), GFP_ATOMIC);
         if (device == NULL)
                 return ERR_PTR(-ENOMEM);
-        memset(device, 0, sizeof (struct dasd_device));
         /* open_count = 0 means device online but not in use */
         atomic_set(&device->open_count, -1);
 
@@ -547,29 +546,26 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
              (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
                 BUG();
 
-        cqr = kmalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
+        cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
         if (cqr == NULL)
                 return ERR_PTR(-ENOMEM);
-        memset(cqr, 0, sizeof(struct dasd_ccw_req));
         cqr->cpaddr = NULL;
         if (cplength > 0) {
-                cqr->cpaddr = kmalloc(cplength*sizeof(struct ccw1),
+                cqr->cpaddr = kcalloc(cplength, sizeof(struct ccw1),
                                       GFP_ATOMIC | GFP_DMA);
                 if (cqr->cpaddr == NULL) {
                         kfree(cqr);
                         return ERR_PTR(-ENOMEM);
                 }
-                memset(cqr->cpaddr, 0, cplength*sizeof(struct ccw1));
         }
         cqr->data = NULL;
         if (datasize > 0) {
-                cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);
+                cqr->data = kzalloc(datasize, GFP_ATOMIC | GFP_DMA);
                 if (cqr->data == NULL) {
                         kfree(cqr->cpaddr);
                         kfree(cqr);
                         return ERR_PTR(-ENOMEM);
                 }
-                memset(cqr->data, 0, datasize);
         }
         strncpy((char *) &cqr->magic, magic, 4);
         ASCEBC((char *) &cqr->magic, 4);
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 44133250da2..be9b05347b4 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -388,12 +388,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         /*
          * get a struct dcssblk_dev_info
          */
-        dev_info = kmalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);
+        dev_info = kzalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);
         if (dev_info == NULL) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(dev_info, 0, sizeof(struct dcssblk_dev_info));
 
         strcpy(dev_info->segment_name, local_buf);
         strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);