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

18 files changed, 39 insertions, 87 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)
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 98587176b327..af381b15fe5c 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -1264,14 +1264,10 @@ static void snd_vx_pcm_free(snd_pcm_t *pcm)
 {
         vx_core_t *chip = pcm->private_data;
         chip->pcm[pcm->device] = NULL;
-        if (chip->playback_pipes) {
-                kfree(chip->playback_pipes);
-                chip->playback_pipes = NULL;
-        }
-        if (chip->capture_pipes) {
-                kfree(chip->capture_pipes);
-                chip->capture_pipes = NULL;
-        }
+        kfree(chip->playback_pipes);
+        chip->playback_pipes = NULL;
+        kfree(chip->capture_pipes);
+        chip->capture_pipes = NULL;
 }
 
 /*
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index bb503e70b664..2da8d7f157f4 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -266,8 +266,7 @@ TEA6330T_TREBLE("Tone Control - Treble", 0)
 
 static void snd_tea6330_free(snd_i2c_device_t *device)
 {
-        tea6330t_t *tea = device->private_data;
-        kfree(tea);
+        kfree(device->private_data);
 }
                                         
 int snd_tea6330t_update_mixer(snd_card_t * card,
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 8995ad9c516d..b75066ab46fc 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -656,8 +656,7 @@ static snd_pcm_hardware_t snd_gf1_pcm_capture =
 
 static void snd_gf1_pcm_playback_free(snd_pcm_runtime_t *runtime)
 {
-        gus_pcm_private_t * pcmp = runtime->private_data;
-        kfree(pcmp);
+        kfree(runtime->private_data);
 }
 
 static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 85caf1bbcc11..0ec0c3ec220b 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -332,11 +332,7 @@ static void snd_ca0106_intr_enable(ca0106_t *emu, unsigned int intrenb)
 
 static void snd_ca0106_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        ca0106_pcm_t *epcm = runtime->private_data;
-  
-        if (epcm) {
-                kfree(epcm);
-        }
+        kfree(runtime->private_data);
 }
 
 /* open_playback callback */
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 5f2ffb7efa06..fd4c50c88bc9 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -1295,8 +1295,7 @@ static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = {
 
 static void snd_cs46xx_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        cs46xx_pcm_t * cpcm = runtime->private_data;
-        kfree(cpcm);
+        kfree(runtime->private_data);
 }
 
 static int _cs46xx_playback_open_channel (snd_pcm_substream_t * substream,int pcm_channel_id)
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index f8d92335a353..e90c5ddd1d17 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -361,10 +361,7 @@ static void snd_emu10k1x_gpio_write(emu10k1x_t *emu, unsigned int value)
 
 static void snd_emu10k1x_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        emu10k1x_pcm_t *epcm = runtime->private_data;
-  
-        if (epcm)
-                kfree(epcm);
+        kfree(runtime->private_data);
 }
 
 static void snd_emu10k1x_pcm_interrupt(emu10k1x_t *emu, emu10k1x_voice_t *voice)
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index fd7cc389f82a..520b99af5f55 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -991,9 +991,7 @@ static void snd_emu10k1_pcm_efx_mixer_notify(emu10k1_t *emu, int idx, int activa
 
 static void snd_emu10k1_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        emu10k1_pcm_t *epcm = runtime->private_data;
-
-        kfree(epcm);
+        kfree(runtime->private_data);
 }
 
 static int snd_emu10k1_efx_playback_close(snd_pcm_substream_t * substream)
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 52d1074f8696..e329e19b674f 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -491,10 +491,8 @@ static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
                 snd_dma_free_pages(&dev->table);
                 dev->table.area = NULL;
         }
-        if (dev->idx_table) {
-                kfree(dev->idx_table);
-                dev->idx_table = NULL;
-        }
+        kfree(dev->idx_table);
+        dev->idx_table = NULL;
         return 0;
 }
 
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index e10fceb3ede9..5896d289f9ac 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -352,10 +352,8 @@ static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
                 snd_dma_free_pages(&dev->table);
                 dev->table.area = NULL;
         }
-        if (dev->idx_table) {
-                kfree(dev->idx_table);
-                dev->idx_table = NULL;
-        }
+        kfree(dev->idx_table);
+        dev->idx_table = NULL;
         return 0;
 }
 
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 997cf37cdddd..2ae79610ecb5 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -829,9 +829,7 @@ static snd_pcm_hardware_t snd_ymfpci_capture =
 
 static void snd_ymfpci_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        ymfpci_pcm_t *ypcm = runtime->private_data;
-        
-        kfree(ypcm);
+        kfree(runtime->private_data);
 }
 
 static int snd_ymfpci_playback_open_1(snd_pcm_substream_t * substream)
diff --git a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c
index 53d8172c52ae..332bbca3dfc4 100644
--- a/sound/pcmcia/vx/vx_entry.c
+++ b/sound/pcmcia/vx/vx_entry.c
@@ -68,8 +68,7 @@ static int snd_vxpocket_free(vx_core_t *chip)
         if (hw)
                 hw->card_list[vxp->index] = NULL;
         chip->card = NULL;
-        if (chip->dev)
-                kfree(chip->dev);
+        kfree(chip->dev);
 
         snd_vx_free_firmware(chip);
         kfree(chip);
diff --git a/sound/synth/emux/emux_effect.c b/sound/synth/emux/emux_effect.c
index ec3fc1ba7fca..4764940f11a0 100644
--- a/sound/synth/emux/emux_effect.c
+++ b/sound/synth/emux/emux_effect.c
@@ -291,10 +291,8 @@ snd_emux_create_effect(snd_emux_port_t *p)
 void
 snd_emux_delete_effect(snd_emux_port_t *p)
 {
-        if (p->effect) {
-                kfree(p->effect);
-                p->effect = NULL;
-        }
+        kfree(p->effect);
+        p->effect = NULL;
 }
 
 void
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index a82412b8790d..a75695045f29 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -859,10 +859,8 @@ static void release_urb_ctx(snd_urb_ctx_t *u)
                 usb_free_urb(u->urb);
                 u->urb = NULL;
         }
-        if (u->buf) {
-                kfree(u->buf);
-                u->buf = NULL;
-        }
+        kfree(u->buf);
+        u->buf = NULL;
 }
 
 /*
@@ -880,10 +878,8 @@ static void release_substream_urbs(snd_usb_substream_t *subs, int force)
                 release_urb_ctx(&subs->dataurb[i]);
         for (i = 0; i < SYNC_URBS; i++)
                 release_urb_ctx(&subs->syncurb[i]);
-        if (subs->tmpbuf) {
-                kfree(subs->tmpbuf);
-                subs->tmpbuf = NULL;
-        }
+        kfree(subs->tmpbuf);
+        subs->tmpbuf = NULL;
         subs->nurbs = 0;
 }
 
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 83ba665e5c6e..e73c1c9d3e73 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -623,10 +623,8 @@ static struct usb_feature_control_info audio_feature_info[] = {
 /* private_free callback */
 static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
 {
-        if (kctl->private_data) {
-                kfree(kctl->private_data);
-                kctl->private_data = NULL;
-        }
+        kfree(kctl->private_data);
+        kctl->private_data = NULL;
 }
 
 
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 4c292e090069..62dfd28b3b07 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -401,10 +401,8 @@ static void usX2Y_urbs_release(snd_usX2Y_substream_t *subs)
         for (i = 0; i < NRURBS; i++)
                 usX2Y_urb_release(subs->urb + i, subs != subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]);
 
-        if (subs->tmpbuf) {
-                kfree(subs->tmpbuf);
-                subs->tmpbuf = NULL;
-        }
+        kfree(subs->tmpbuf);
+        subs->tmpbuf = NULL;
 }
 /*
  * initialize a substream's urbs