[PATCH 1/13] ALSA: seq: Deletion of unnecessary checks before the function call "snd_midi_event_free"

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sat, 3 Jan 2015 14:54:56 +0100

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 <elfr...@users.sourceforge.net>
---
 sound/core/seq/oss/seq_oss_midi.c | 6 ++----
 sound/core/seq/seq_midi.c         | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sound/core/seq/oss/seq_oss_midi.c 
b/sound/core/seq/oss/seq_oss_midi.c
index 3a45696..e79cc44 100644
--- a/sound/core/seq/oss/seq_oss_midi.c
+++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -237,8 +237,7 @@ snd_seq_oss_midi_check_exit_port(int client, int port)
                spin_unlock_irqrestore(&register_lock, flags);
                snd_use_lock_free(&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);
        }
        spin_lock_irqsave(&register_lock, flags);
@@ -265,8 +264,7 @@ snd_seq_oss_midi_clear_all(void)
        spin_lock_irqsave(&register_lock, flags);
        for (i = 0; i < max_midi_devs; i++) {
                if ((mdev = midi_devs[i]) != NULL) {
-                       if (mdev->coder)
-                               snd_midi_event_free(mdev->coder);
+                       snd_midi_event_free(mdev->coder);
                        kfree(mdev);
                        midi_devs[i] = NULL;
                }
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index a1fd77a..68fec77 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -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);
        }
 
-       if (msynth->parser)
-               snd_midi_event_free(msynth->parser);
+       snd_midi_event_free(msynth->parser);
 }
 
 /* register new midi synth port */
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/