[PATCH] vfree and kfree cleanup in drivers/

This patch does a full cleanup of 'NULL checks before vfree', and a partial
cleanup of calls to kfree for all of drivers/ - the kfree bit is partial in
that I only did the files that also had vfree calls in them.  The patch
also gets rid of some redundant (void *) casts of pointers being passed to
[vk]free, and a some tiny whitespace corrections also crept in.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5 files changed, 27 insertions, 51 deletions

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index cdda423386c5..9774e94d1e7d 100644
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -445,10 +445,8 @@ static void cpia_usb_free_resources(struct usb_cpia *ucpia, int try)
                 ucpia->sbuf[1].urb = NULL;
         }
 
-        if (ucpia->sbuf[1].data) {
-                kfree(ucpia->sbuf[1].data);
-                ucpia->sbuf[1].data = NULL;
-        }
+        kfree(ucpia->sbuf[1].data);
+        ucpia->sbuf[1].data = NULL;
  
         if (ucpia->sbuf[0].urb) {
                 usb_kill_urb(ucpia->sbuf[0].urb);
@@ -456,10 +454,8 @@ static void cpia_usb_free_resources(struct usb_cpia *ucpia, int try)
                 ucpia->sbuf[0].urb = NULL;
         }
 
-        if (ucpia->sbuf[0].data) {
-                kfree(ucpia->sbuf[0].data);
-                ucpia->sbuf[0].data = NULL;
-        }
+        kfree(ucpia->sbuf[0].data);
+        ucpia->sbuf[0].data = NULL;
 }
 
 static int cpia_usb_close(void *privdata)
@@ -623,20 +619,14 @@ static void cpia_disconnect(struct usb_interface *intf)
 
         ucpia->curbuff = ucpia->workbuff = NULL;
 
-        if (ucpia->buffers[2]) {
-                vfree(ucpia->buffers[2]);
-                ucpia->buffers[2] = NULL;
-        }
+        vfree(ucpia->buffers[2]);
+        ucpia->buffers[2] = NULL;
 
-        if (ucpia->buffers[1]) {
-                vfree(ucpia->buffers[1]);
-                ucpia->buffers[1] = NULL;
-        }
+        vfree(ucpia->buffers[1]);
+        ucpia->buffers[1] = NULL;
 
-        if (ucpia->buffers[0]) {
-                vfree(ucpia->buffers[0]);
-                ucpia->buffers[0] = NULL;
-        }
+        vfree(ucpia->buffers[0]);
+        ucpia->buffers[0] = NULL;
 
         cam->lowlevel_data = NULL;
         kfree(ucpia);
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index b57743571087..d4497dbae05c 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -2184,30 +2184,18 @@ static void release_saa(void)
                 vfree(saa->vidbuf);
                 vfree(saa->audbuf);
                 vfree(saa->osdbuf);
-                if (saa->dmavid2)
-                        kfree((void *) saa->dmavid2);
+                kfree(saa->dmavid2);
                 saa->audbuf = saa->vidbuf = saa->osdbuf = NULL;
                 saa->dmavid2 = NULL;
-                if (saa->dmadebi)
-                        kfree((void *) saa->dmadebi);
-                if (saa->dmavid1)
-                        kfree((void *) saa->dmavid1);
-                if (saa->dmavid2)
-                        kfree((void *) saa->dmavid2);
-                if (saa->dmavid3)
-                        kfree((void *) saa->dmavid3);
-                if (saa->dmaa1in)
-                        kfree((void *) saa->dmaa1in);
-                if (saa->dmaa1out)
-                        kfree((void *) saa->dmaa1out);
-                if (saa->dmaa2in)
-                        kfree((void *) saa->dmaa2in);
-                if (saa->dmaa2out)
-                        kfree((void *) saa->dmaa2out);
-                if (saa->dmaRPS1)
-                        kfree((void *) saa->dmaRPS1);
-                if (saa->dmaRPS2)
-                        kfree((void *) saa->dmaRPS2);
+                kfree(saa->dmadebi);
+                kfree(saa->dmavid1);
+                kfree(saa->dmavid3);
+                kfree(saa->dmaa1in);
+                kfree(saa->dmaa1out);
+                kfree(saa->dmaa2in);
+                kfree(saa->dmaa2out);
+                kfree(saa->dmaRPS1);
+                kfree(saa->dmaRPS2);
                 free_irq(saa->irq, saa);
                 if (saa->saa7146_mem)
                         iounmap(saa->saa7146_mem);
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 97354f253a80..574b8e36f3c6 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -267,10 +267,10 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
                 kfree(dma->pages);
                 dma->pages = NULL;
         }
-        if (dma->vmalloc) {
-                vfree(dma->vmalloc);
-                dma->vmalloc = NULL;
-        }
+
+        vfree(dma->vmalloc);
+        dma->vmalloc = NULL;
+
         if (dma->bus_addr) {
                 dma->bus_addr = 0;
         }
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index ba838a42ec80..53adeb70f2ca 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -650,7 +650,7 @@ jpg_fbuffer_free (struct file *file)
                                      off += PAGE_SIZE)
                                         ClearPageReserved(MAP_NR
                                                           (mem + off));
-                                kfree((void *) mem);
+                                kfree(mem);
                                 fh->jpg_buffers.buffer[i].frag_tab[0] = 0;
                                 fh->jpg_buffers.buffer[i].frag_tab[1] = 0;
                         }
diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c
index c33533155cc7..07286816d7df 100644
--- a/drivers/media/video/zr36120.c
+++ b/drivers/media/video/zr36120.c
@@ -820,11 +820,9 @@ void zoran_close(struct video_device* dev)
         msleep(100);                    /* Wait 1/10th of a second */
 
         /* free the allocated framebuffer */
-        if (ztv->fbuffer)
-                bfree( ztv->fbuffer, ZORAN_MAX_FBUFSIZE );
+        bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE);
         ztv->fbuffer = 0;
-        if (ztv->overinfo.overlay)
-                kfree( ztv->overinfo.overlay );
+        kfree(ztv->overinfo.overlay);
         ztv->overinfo.overlay = 0;
 
 }