[ALSA] Remove redundant NULL checks before kfree

Timer Midlevel,ALSA sequencer,ALSA<-OSS sequencer,Digigram VX core
I2C tea6330t,GUS Library,VIA82xx driver,VIA82xx-modem driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,YMFPCI driver
Digigram VX Pocket driver,Common EMU synth,USB generic driver,USB USX2Y
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: Takashi Iwai <tiwai@suse.de>

3 files changed, 13 insertions, 28 deletions

diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c
index 638cc148706d..1a7736cbf3a4 100644
--- a/sound/core/seq/oss/seq_oss_synth.c
+++ b/sound/core/seq/oss/seq_oss_synth.c
@@ -325,14 +325,10 @@ snd_seq_oss_synth_cleanup(seq_oss_devinfo_t *dp)
                         }
                         snd_use_lock_free(&rec->use_lock);
                 }
-                if (info->sysex) {
-                        kfree(info->sysex);
-                        info->sysex = NULL;
-                }
-                if (info->ch) {
-                        kfree(info->ch);
-                        info->ch = NULL;
-                }
+                kfree(info->sysex);
+                info->sysex = NULL;
+                kfree(info->ch);
+                info->ch = NULL;
         }
         dp->synth_opened = 0;
         dp->max_synthdev = 0;
@@ -418,14 +414,10 @@ snd_seq_oss_synth_reset(seq_oss_devinfo_t *dp, int dev)
                                           dp->file_mode) < 0) {
                         midi_synth_dev.opened--;
                         info->opened = 0;
-                        if (info->sysex) {
-                                kfree(info->sysex);
-                                info->sysex = NULL;
-                        }
-                        if (info->ch) {
-                                kfree(info->ch);
-                                info->ch = NULL;
-                        }
+                        kfree(info->sysex);
+                        info->sysex = NULL;
+                        kfree(info->ch);
+                        info->ch = NULL;
                 }
                 return;
         }
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index e88967c5b93d..ea945a5d2a0b 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -140,10 +140,7 @@ dummy_input(snd_seq_event_t *ev, int direct, void *private_data, int atomic, int
 static void
 dummy_free(void *private_data)
 {
-        snd_seq_dummy_port_t *p;
-
-        p = private_data;
-        kfree(p);
+        kfree(private_data);
 }
 
 /*
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d67a5e91a108..b498e5482d77 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1469,14 +1469,10 @@ static int snd_timer_user_tselect(struct file *file, snd_timer_select_t __user *
         if ((err = snd_timer_open(&tu->timeri, str, &tselect.id, current->pid)) < 0)
                 goto __err;
 
-        if (tu->queue) {
-                kfree(tu->queue);
-                tu->queue = NULL;
-        }
-        if (tu->tqueue) {
-                kfree(tu->tqueue);
-                tu->tqueue = NULL;
-        }
+        kfree(tu->queue);
+        tu->queue = NULL;
+        kfree(tu->tqueue);
+        tu->tqueue = NULL;
         if (tu->tread) {
                 tu->tqueue = (snd_timer_tread_t *)kmalloc(tu->queue_size * sizeof(snd_timer_tread_t), GFP_KERNEL);
                 if (tu->tqueue == NULL)