aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-06-25 17:59:02 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:03 -0400
commitf25ad2d3b886e61d7ec03a3bdefc22871c14e9da (patch)
tree5177f9412ec67d49f54a4c0c93c515e6e5671ef3
parenta4cd16e2e8f0924d8e3a2391edc51556cad26d99 (diff)
[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>
-rw-r--r--sound/oss/sscape.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c
index 50ca64629450..9ed5211c3168 100644
--- a/sound/oss/sscape.c
+++ b/sound/oss/sscape.c
@@ -991,7 +991,6 @@ static void __init sscape_pnp_init_hw(sscape_info* devc)
991 unsigned i; 991 unsigned i;
992 static char code_file_name[23] = "/sndscape/sndscape.cox"; 992 static char code_file_name[23] = "/sndscape/sndscape.cox";
993 993
994 int sscape_sb_enable = 0;
995 int sscape_joystic_enable = 0x7f; 994 int sscape_joystic_enable = 0x7f;
996 int sscape_mic_enable = 0; 995 int sscape_mic_enable = 0;
997 int sscape_ext_midi = 0; 996 int sscape_ext_midi = 0;
@@ -1015,14 +1014,9 @@ static void __init sscape_pnp_init_hw(sscape_info* devc)
1015 sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); 1014 sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40);
1016 sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); 1015 sscape_write( devc, 3, ( devc -> dma << 4) | 0x80);
1017 1016
1018 if ( sscape_sb_enable ) 1017 sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq);
1019 sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq);
1020 else
1021 sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq);
1022 1018
1023 i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0); 1019 i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0);
1024 if ( sscape_sb_enable )
1025 i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07;
1026 if (sscape_joystic_enable) i |= 8; 1020 if (sscape_joystic_enable) i |= 8;
1027 1021
1028 sscape_write (devc, 9, i); 1022 sscape_write (devc, 9, i);