diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-21 13:32:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-21 14:07:36 -0500 |
commit | 966b7bc9354ab8f59f0ef2d96306615157e0f76e (patch) | |
tree | eee31a0a126fe660d86821bdc1ec623308892cc5 /sound/isa | |
parent | 42d772101274492ca15258ea346e6ebbc2bc9bd0 (diff) |
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>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/sb/emu8000_synth.c | 3 | ||||
-rw-r--r-- | sound/isa/sb/sb_common.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c index 4e3fcfb15ad4..95b39beb61c1 100644 --- 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) | |||
105 | snd_device_free(dev->card, hw->pcm); | 105 | snd_device_free(dev->card, hw->pcm); |
106 | if (hw->emu) | 106 | if (hw->emu) |
107 | snd_emux_free(hw->emu); | 107 | snd_emux_free(hw->emu); |
108 | if (hw->memhdr) | 108 | snd_util_memhdr_free(hw->memhdr); |
109 | snd_util_memhdr_free(hw->memhdr); | ||
110 | hw->emu = NULL; | 109 | hw->emu = NULL; |
111 | hw->memhdr = NULL; | 110 | hw->memhdr = NULL; |
112 | return 0; | 111 | return 0; |
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 3ef990602cdd..f22b4480828e 100644 --- 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) | |||
184 | 184 | ||
185 | static int snd_sbdsp_free(struct snd_sb *chip) | 185 | static int snd_sbdsp_free(struct snd_sb *chip) |
186 | { | 186 | { |
187 | if (chip->res_port) | 187 | release_and_free_resource(chip->res_port); |
188 | release_and_free_resource(chip->res_port); | ||
189 | if (chip->irq >= 0) | 188 | if (chip->irq >= 0) |
190 | free_irq(chip->irq, (void *) chip); | 189 | free_irq(chip->irq, (void *) chip); |
191 | #ifdef CONFIG_ISA | 190 | #ifdef CONFIG_ISA |