[PATCH] remove redundant NULL checks before kfree() in sound/ and avoid casting pointers about to be kfree()'ed

Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8 files changed, 16 insertions, 28 deletions

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 4384dac3f794..7c835abd99bc 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -2178,8 +2178,7 @@ void ad1848_unload(int io_base, int irq, int dma_playback, int dma_capture, int
                 
         if (devc != NULL)
         {
-                if(audio_devs[dev]->portc!=NULL)
-                        kfree(audio_devs[dev]->portc);
+                kfree(audio_devs[dev]->portc);
                 release_region(devc->base, 4);
 
                 if (!share_dma)
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index b767c621fd09..2cfd214e4c2a 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -277,8 +277,7 @@ static void ad1889_free_dev(ad1889_dev_t *dev)
 
         for (j = 0; j < AD_MAX_STATES; j++) {
                 dmabuf = &dev->state[j].dmabuf;
-                if (dmabuf->rawbuf != NULL) 
-                        kfree(dmabuf->rawbuf);
+                kfree(dmabuf->rawbuf);
         }
 
         kfree(dev);
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 5281b88987f3..33108661e671 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -671,14 +671,10 @@ static void PMacIrqCleanup(void)
         release_OF_resource(awacs_node, 1);
         release_OF_resource(awacs_node, 2);
 
-        if (awacs_tx_cmd_space)
-                kfree(awacs_tx_cmd_space);
-        if (awacs_rx_cmd_space)
-                kfree(awacs_rx_cmd_space);
-        if (beep_dbdma_cmd_space)
-                kfree(beep_dbdma_cmd_space);
-        if (beep_buf)
-                kfree(beep_buf);
+        kfree(awacs_tx_cmd_space);
+        kfree(awacs_rx_cmd_space);
+        kfree(beep_dbdma_cmd_space);
+        kfree(beep_buf);
 #ifdef CONFIG_PMAC_PBOOK
         pmu_unregister_sleep_notifier(&awacs_sleep_notifier);
 #endif
@@ -2301,8 +2297,7 @@ if (count <= 0)
 #endif
 
         if ((write_sq.max_count + 1) > number_of_tx_cmd_buffers) {
-                if (awacs_tx_cmd_space)
-                        kfree(awacs_tx_cmd_space);
+                kfree(awacs_tx_cmd_space);
                 number_of_tx_cmd_buffers = 0;
 
                 /* we need nbufs + 1 (for the loop) and we should request + 1
@@ -2360,8 +2355,7 @@ if (count <= 0)
 #endif
 
         if ((read_sq.max_count+1) > number_of_rx_cmd_buffers ) {
-                if (awacs_rx_cmd_space)
-                        kfree(awacs_rx_cmd_space);
+                kfree(awacs_rx_cmd_space);
                 number_of_rx_cmd_buffers = 0;
 
                 /* we need nbufs + 1 (for the loop) and we should request + 1 again
@@ -2805,7 +2799,7 @@ __init setup_beep(void)
         beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
         if (beep_buf == NULL) {
                 printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n");
-                if( beep_dbdma_cmd_space ) kfree(beep_dbdma_cmd_space) ;
+                kfree(beep_dbdma_cmd_space) ;
                 return -ENOMEM ;
         }
         return 0 ;
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c
index 33dea3d56c1e..b40b5f97aace 100644
--- a/sound/oss/emu10k1/midi.c
+++ b/sound/oss/emu10k1/midi.c
@@ -523,10 +523,8 @@ void emu10k1_seq_midi_close(int dev)
         card = midi_devs[dev]->devc;
         emu10k1_mpuout_close(card);
 
-        if (card->seq_mididev) {
-                kfree(card->seq_mididev);
-                card->seq_mididev = NULL;
-        }
+        kfree(card->seq_mididev);
+        card->seq_mididev = NULL;
 }
 
 int emu10k1_seq_midi_out(int dev, unsigned char midi_byte)
diff --git a/sound/oss/emu10k1/passthrough.c b/sound/oss/emu10k1/passthrough.c
index 4094be55f3be..4e3baca7d41f 100644
--- a/sound/oss/emu10k1/passthrough.c
+++ b/sound/oss/emu10k1/passthrough.c
@@ -213,8 +213,7 @@ void emu10k1_pt_stop(struct emu10k1_card *card)
                                 sblive_writeptr(card, SPCS0 + i, 0, pt->old_spcs[i]);
                 }
                 pt->state = PT_STATE_INACTIVE;
-                if(pt->buf)
-                        kfree(pt->buf);
+                kfree(pt->buf);
         }
 }
 
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index 52d2db4bc312..3dce504e6d6d 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -2356,7 +2356,7 @@ ess_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
         }
 
 rec_return_free:
-        if(combbuf) kfree(combbuf);
+        kfree(combbuf);
         return ret;
 }
 
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index b66f53fa8db0..0aac54c68f01 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1240,8 +1240,7 @@ void unload_mpu401(struct address_info *hw_config)
                 p=mpu401_synth_operations[n];
                 sound_unload_mididev(n);
                 sound_unload_timerdev(hw_config->slots[2]);
-                if(p)
-                        kfree(p);
+                kfree(p);
         }
 }
 
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index ce359e6c933a..5f955e3d2e26 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -915,8 +915,8 @@ void sb_dsp_unload(struct address_info *hw_config, int sbmpu)
         }
         else
                 release_region(hw_config->io_base, 16);
-        if(detected_devc)
-                kfree(detected_devc);
+
+        kfree(detected_devc);
 }
 
 /*