[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>

1 files changed, 7 insertions, 13 deletions

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 9ed37dc9a1b0..814f9258ce00 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -1686,16 +1686,14 @@ qdio_alloc_qs(struct qdio_irq *irq_ptr,
         int result=-ENOMEM;
 
         for (i=0;i<no_input_qs;i++) {
-                q=kmalloc(sizeof(struct qdio_q),GFP_KERNEL);
+                q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
 
                 if (!q) {
                         QDIO_PRINT_ERR("kmalloc of q failed!\n");
                         goto out;
                 }
 
-                memset(q,0,sizeof(struct qdio_q));
-
-                q->slib=kmalloc(PAGE_SIZE,GFP_KERNEL);
+                q->slib = kmalloc(PAGE_SIZE, GFP_KERNEL);
                 if (!q->slib) {
                         QDIO_PRINT_ERR("kmalloc of slib failed!\n");
                         goto out;
@@ -1705,14 +1703,12 @@ qdio_alloc_qs(struct qdio_irq *irq_ptr,
         }
 
         for (i=0;i<no_output_qs;i++) {
-                q=kmalloc(sizeof(struct qdio_q),GFP_KERNEL);
+                q = kzalloc(sizeof(struct qdio_q), GFP_KERNEL);
 
                 if (!q) {
                         goto out;
                 }
 
-                memset(q,0,sizeof(struct qdio_q));
-
                 q->slib=kmalloc(PAGE_SIZE,GFP_KERNEL);
                 if (!q->slib) {
                         QDIO_PRINT_ERR("kmalloc of slib failed!\n");
@@ -2984,7 +2980,7 @@ qdio_allocate(struct qdio_initialize *init_data)
         qdio_allocate_do_dbf(init_data);
 
         /* create irq */
-        irq_ptr=kmalloc(sizeof(struct qdio_irq), GFP_KERNEL | GFP_DMA);
+        irq_ptr = kzalloc(sizeof(struct qdio_irq), GFP_KERNEL | GFP_DMA);
 
         QDIO_DBF_TEXT0(0,setup,"irq_ptr:");
         QDIO_DBF_HEX0(0,setup,&irq_ptr,sizeof(void*));
@@ -2994,8 +2990,6 @@ qdio_allocate(struct qdio_initialize *init_data)
                 return -ENOMEM;
         }
 
-        memset(irq_ptr,0,sizeof(struct qdio_irq));
-
         init_MUTEX(&irq_ptr->setting_up_sema);
 
         /* QDR must be in DMA area since CCW data address is only 32 bit */
@@ -3686,10 +3680,10 @@ qdio_get_qdio_memory(void)
 
         for (i=1;i<INDICATORS_PER_CACHELINE;i++)
                 indicator_used[i]=0;
-        indicators=(__u32*)kmalloc(sizeof(__u32)*(INDICATORS_PER_CACHELINE),
+        indicators = kzalloc(sizeof(__u32)*(INDICATORS_PER_CACHELINE),
                                    GFP_KERNEL);
-        if (!indicators) return -ENOMEM;
-        memset(indicators,0,sizeof(__u32)*(INDICATORS_PER_CACHELINE));
+        if (!indicators)
+                return -ENOMEM;
         return 0;
 }