tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] sound/oss/sscape.c: remove dead code

The Coverity checker found that sscape_sb_enable never get's assigned any
value different from 0, and therefore some code paths are impossible.

This patch removes this variable and the dead code paths.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Adrian Bunk and committed by Linus Torvalds f25ad2d3 a4cd16e2

+1 -7
unified split
+1 -7
sound/oss/sscape.c
··· 991 991 unsigned i; 992 992 static char code_file_name[23] = "/sndscape/sndscape.cox"; 993 993 994 - int sscape_sb_enable = 0; 995 994 int sscape_joystic_enable = 0x7f; 996 995 int sscape_mic_enable = 0; 997 996 int sscape_ext_midi = 0; ··· 1014 1015 sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); 1015 1016 sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); 1016 1017 1017 - if ( sscape_sb_enable ) 1018 - sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq); 1019 - else 1020 - sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); 1018 + sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); 1021 1019 1022 1020 i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0); 1023 - if ( sscape_sb_enable ) 1024 - i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07; 1025 1021 if (sscape_joystic_enable) i |= 8; 1026 1022 1027 1023 sscape_write (devc, 9, i);