Skip to content

Commit

Permalink
[PATCH] sound/oss/sscape.c: remove dead code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jun 25, 2005
1 parent a4cd16e commit f25ad2d
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions sound/oss/sscape.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit f25ad2d

Please sign in to comment.