Commit f25ad2d3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4cd16e2
...@@ -991,7 +991,6 @@ static void __init sscape_pnp_init_hw(sscape_info* devc) ...@@ -991,7 +991,6 @@ static void __init sscape_pnp_init_hw(sscape_info* devc)
unsigned i; unsigned i;
static char code_file_name[23] = "/sndscape/sndscape.cox"; static char code_file_name[23] = "/sndscape/sndscape.cox";
int sscape_sb_enable = 0;
int sscape_joystic_enable = 0x7f; int sscape_joystic_enable = 0x7f;
int sscape_mic_enable = 0; int sscape_mic_enable = 0;
int sscape_ext_midi = 0; int sscape_ext_midi = 0;
...@@ -1015,14 +1014,9 @@ static void __init sscape_pnp_init_hw(sscape_info* devc) ...@@ -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, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40);
sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); 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); 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; if (sscape_joystic_enable) i |= 8;
sscape_write (devc, 9, i); sscape_write (devc, 9, i);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment