Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57dca36e authored Jan 03, 2015 by Markus Elfring Committed by Takashi Iwai Jan 04, 2015

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



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>

parent adc2ae0b

sound/core/seq/oss/seq_oss_midi.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,6 @@ 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);
	}		}
	@@ -265,7 +264,6 @@ 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;

sound/core/seq/seq_midi.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -268,7 +268,6 @@ 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);
	}		}