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

The functions release_and_free_resource() 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>

diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
index 4e3fcfb15ad4a98eea8c06d97b77e1655e469d50..95b39beb61c19b8d10f38b5e65e86b1fb7acdf9b 100644 (file)
--- a/sound/isa/sb/emu8000_synth.c
+++ b/sound/isa/sb/emu8000_synth.c
@@ -105,8 +105,7 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev)
                snd_device_free(dev->card, hw->pcm);
        if (hw->emu)
                snd_emux_free(hw->emu);
-       if (hw->memhdr)
-               snd_util_memhdr_free(hw->memhdr);
+       snd_util_memhdr_free(hw->memhdr);
        hw->emu = NULL;
        hw->memhdr = NULL;
        return 0;

diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index 3ef990602cdd63b84625bdeda3f5bc201923e58e..f22b4480828e031e761dbd8ee52dbcae2c0160db 100644 (file)
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -184,8 +184,7 @@ static int snd_sbdsp_probe(struct snd_sb * chip)
 
 static int snd_sbdsp_free(struct snd_sb *chip)
 {
-       if (chip->res_port)
-               release_and_free_resource(chip->res_port);
+       release_and_free_resource(chip->res_port);
        if (chip->irq >= 0)
                free_irq(chip->irq, (void *) chip);
 #ifdef CONFIG_ISA