Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: seq: Deletion of unnecessary checks before the function call "snd_midi_event_free"

Browse source 
The snd_midi_event_free() function tests whether its argument is NULL and then
returns 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>
This commit is contained in:
Markus Elfring 2015-01-03 14:54:56 +01:00 committed by Takashi Iwai
parent adc2ae0bb6
commit 57dca36ee2
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/core/seq/oss/seq_oss_midi.c
View file

@ -237,8 +237,7 @@ snd_seq_oss_midi_check_exit_port(int client, int port)
spin_unlock_irqrestore(&register_lock, flags); spin_unlock_irqrestore(&register_lock, flags);
snd_use_lock_free(&mdev->use_lock); snd_use_lock_free(&mdev->use_lock);
snd_use_lock_sync(&mdev->use_lock); snd_use_lock_sync(&mdev->use_lock);
if (mdev->coder) snd_midi_event_free(mdev->coder);
snd_midi_event_free(mdev->coder);
kfree(mdev); kfree(mdev);
} }
spin_lock_irqsave(&register_lock, flags); spin_lock_irqsave(&register_lock, flags);
@ -265,8 +264,7 @@ snd_seq_oss_midi_clear_all(void)
spin_lock_irqsave(&register_lock, flags); spin_lock_irqsave(&register_lock, flags);
for (i = 0; i < max_midi_devs; i++) { for (i = 0; i < max_midi_devs; i++) {
if ((mdev = midi_devs[i]) != NULL) { if ((mdev = midi_devs[i]) != NULL) {
if (mdev->coder) snd_midi_event_free(mdev->coder);
snd_midi_event_free(mdev->coder);
kfree(mdev); kfree(mdev);
midi_devs[i] = NULL; midi_devs[i] = NULL;
} }

3
sound/core/seq/seq_midi.c
View file

@ -268,8 +268,7 @@ static void snd_seq_midisynth_delete(struct seq_midisynth *msynth)
snd_seq_event_port_detach(msynth->seq_client, msynth->seq_port); snd_seq_event_port_detach(msynth->seq_client, msynth->seq_port);
} }
if (msynth->parser) snd_midi_event_free(msynth->parser);
snd_midi_event_free(msynth->parser);
} }
/* register new midi synth port */ /* register new midi synth port */