diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-06-25 14:59:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:25:03 -0700 |
| commit | f25ad2d3b886e61d7ec03a3bdefc22871c14e9da (patch) | |
| tree | 5177f9412ec67d49f54a4c0c93c515e6e5671ef3 | |
| parent | a4cd16e2e8f0924d8e3a2391edc51556cad26d99 (diff) | |
| download | op-kernel-dev-f25ad2d3b886e61d7ec03a3bdefc22871c14e9da.zip op-kernel-dev-f25ad2d3b886e61d7ec03a3bdefc22871c14e9da.tar.gz | |
[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.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c index 50ca646..9ed5211 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) unsigned i; static char code_file_name[23] = "/sndscape/sndscape.cox"; - int sscape_sb_enable = 0; int sscape_joystic_enable = 0x7f; int sscape_mic_enable = 0; int sscape_ext_midi = 0; @@ -1015,14 +1014,9 @@ static void __init sscape_pnp_init_hw(sscape_info* devc) sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); - if ( sscape_sb_enable ) - sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq); - else - sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); + sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0); - if ( sscape_sb_enable ) - i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07; if (sscape_joystic_enable) i |= 8; sscape_write (devc, 9, i); |
