Jelajahi Sumber

ALSA: emu10k1: Deletion of unnecessary checks before three function calls

The functions kfree(), release_firmware() and snd_util_memhdr_free() test
whether their argument is NULL and then return immediately. Thus the test
around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Markus Elfring 10 tahun lalu
induk
melakukan
31604d35db
2 mengubah file dengan 4 tambahan dan 8 penghapusan
  1. 3 6
      sound/pci/emu10k1/emu10k1_main.c
  2. 1 2
      sound/pci/emu10k1/emufx.c

+ 3 - 6
sound/pci/emu10k1/emu10k1_main.c

@@ -1289,10 +1289,8 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
 	}
 	}
 	if (emu->emu1010.firmware_thread)
 	if (emu->emu1010.firmware_thread)
 		kthread_stop(emu->emu1010.firmware_thread);
 		kthread_stop(emu->emu1010.firmware_thread);
-	if (emu->firmware)
-		release_firmware(emu->firmware);
-	if (emu->dock_fw)
-		release_firmware(emu->dock_fw);
+	release_firmware(emu->firmware);
+	release_firmware(emu->dock_fw);
 	if (emu->irq >= 0)
 	if (emu->irq >= 0)
 		free_irq(emu->irq, emu);
 		free_irq(emu->irq, emu);
 	/* remove reserved page */
 	/* remove reserved page */
@@ -1301,8 +1299,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
 			(struct snd_util_memblk *)emu->reserved_page);
 			(struct snd_util_memblk *)emu->reserved_page);
 		emu->reserved_page = NULL;
 		emu->reserved_page = NULL;
 	}
 	}
-	if (emu->memhdr)
-		snd_util_memhdr_free(emu->memhdr);
+	snd_util_memhdr_free(emu->memhdr);
 	if (emu->silent_page.area)
 	if (emu->silent_page.area)
 		snd_dma_free_pages(&emu->silent_page);
 		snd_dma_free_pages(&emu->silent_page);
 	if (emu->ptb_pages.area)
 	if (emu->ptb_pages.area)

+ 1 - 2
sound/pci/emu10k1/emufx.c

@@ -777,8 +777,7 @@ static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl)
 	kctl->private_value = 0;
 	kctl->private_value = 0;
 	list_del(&ctl->list);
 	list_del(&ctl->list);
 	kfree(ctl);
 	kfree(ctl);
-	if (kctl->tlv.p)
-		kfree(kctl->tlv.p);
+	kfree(kctl->tlv.p);
 }
 }
 
 
 static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
 static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,