[PATCH] kfree cleanup: drivers/s390

This is the drivers/s390/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/s390/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Cornelia Huck <cohuck@de.ibm.com>
Acked-by: Stefan Bader <Stefan.Bader@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 6 insertions, 12 deletions

diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index c05b069c2996..b978f7fe8327 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -642,8 +642,7 @@ static void
 free_cmbe (struct ccw_device *cdev)
 {
         spin_lock_irq(cdev->ccwlock);
-        if (cdev->private->cmb)
-                kfree(cdev->private->cmb);
+        kfree(cdev->private->cmb);
         cdev->private->cmb = NULL;
         spin_unlock_irq(cdev->ccwlock);
 
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index ad3fe5aeb663..85a3026e6900 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -550,10 +550,8 @@ ccw_device_stlck(struct ccw_device *cdev)
         /* Clear irb. */
         memset(&cdev->private->irb, 0, sizeof(struct irb));
 out_unlock:
-        if (buf)
-                kfree(buf);
-        if (buf2)
-                kfree(buf2);
+        kfree(buf);
+        kfree(buf2);
         spin_unlock_irqrestore(&sch->lock, flags);
         return ret;
 }
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index ef5cd07011bb..eb39218b925e 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -1338,16 +1338,14 @@ qdio_release_irq_memory(struct qdio_irq *irq_ptr)
                 if (!irq_ptr->input_qs[i])
                         goto next;
 
-                if (irq_ptr->input_qs[i]->slib)
-                        kfree(irq_ptr->input_qs[i]->slib);
+                kfree(irq_ptr->input_qs[i]->slib);
                 kfree(irq_ptr->input_qs[i]);
 
 next:
                 if (!irq_ptr->output_qs[i])
                         continue;
 
-                if (irq_ptr->output_qs[i]->slib)
-                        kfree(irq_ptr->output_qs[i]->slib);
+                kfree(irq_ptr->output_qs[i]->slib);
                 kfree(irq_ptr->output_qs[i]);
 
         }
@@ -3315,8 +3313,7 @@ qdio_get_qdio_memory(void)
 static void
 qdio_release_qdio_memory(void)
 {
-        if (indicators)
-                kfree(indicators);
+        kfree(indicators);
 }
 
 static void