Browse Source

ALSA: core: Deletion of unnecessary checks before two function calls

The functions snd_seq_oss_timer_delete() and vunmap() perform also input
parameter validation. 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 years ago
parent
commit
d712eaf29d
2 changed files with 4 additions and 8 deletions
  1. 3 6
      sound/core/seq/oss/seq_oss_init.c
  2. 1 2
      sound/core/sgbuf.c

+ 3 - 6
sound/core/seq/oss/seq_oss_init.c

@@ -403,14 +403,11 @@ free_devinfo(void *private)
 {
 {
 	struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private;
 	struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private;
 
 
-	if (dp->timer)
-		snd_seq_oss_timer_delete(dp->timer);
+	snd_seq_oss_timer_delete(dp->timer);
 		
 		
-	if (dp->writeq)
-		snd_seq_oss_writeq_delete(dp->writeq);
+	snd_seq_oss_writeq_delete(dp->writeq);
 
 
-	if (dp->readq)
-		snd_seq_oss_readq_delete(dp->readq);
+	snd_seq_oss_readq_delete(dp->readq);
 	
 	
 	kfree(dp);
 	kfree(dp);
 }
 }

+ 1 - 2
sound/core/sgbuf.c

@@ -39,8 +39,7 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
 	if (! sgbuf)
 	if (! sgbuf)
 		return -EINVAL;
 		return -EINVAL;
 
 
-	if (dmab->area)
-		vunmap(dmab->area);
+	vunmap(dmab->area);
 	dmab->area = NULL;
 	dmab->area = NULL;
 
 
 	tmpb.dev.type = SNDRV_DMA_TYPE_DEV;
 	tmpb.dev.type = SNDRV_DMA_TYPE_DEV;