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

Commit 966b7bc9 authored Nov 21, 2014 by Markus Elfring Committed by Takashi Iwai Nov 21, 2014

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>

parent 42d77210

sound/isa/sb/emu8000_synth.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -105,7 +105,6 @@ 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);
		hw->emu = NULL;
		hw->memhdr = NULL;

sound/isa/sb/sb_common.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ 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);
		if (chip->irq >= 0)
		free_irq(chip->irq, (void *) chip);