diff options
| author | Peter Eriksen <s022018@student.dtu.dk> | 2007-01-29 14:45:53 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 09:03:13 +0100 |
| commit | 377a4f7ea35d7d6cc05faea7030522d93435dc11 (patch) | |
| tree | ea5f77402cd05c2df7288e8abd00982355e5ac42 /sound/isa/gus | |
| parent | cd7509a43c3047a6339484e5009c2db7ee4c7a51 (diff) | |
| download | talos-obmc-linux-377a4f7ea35d7d6cc05faea7030522d93435dc11.tar.gz talos-obmc-linux-377a4f7ea35d7d6cc05faea7030522d93435dc11.zip | |
[ALSA] sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/gus')
| -rw-r--r-- | sound/isa/gus/gus_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index b680fddf0d74..8ced5e81b9a7 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c @@ -294,10 +294,10 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches) gus->mix_cntrl_reg |= 4; /* enable MIC */ } dma1 = gus->gf1.dma1; - dma1 = dma1 < 0 ? -dma1 : dma1; + dma1 = abs(dma1); dma1 = dmas[dma1 & 7]; dma2 = gus->gf1.dma2; - dma2 = dma2 < 0 ? -dma2 : dma2; + dma2 = abs(dma2); dma2 = dmas[dma2 & 7]; dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3); @@ -306,7 +306,7 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches) return -EINVAL; } irq = gus->gf1.irq; - irq = irq < 0 ? -irq : irq; + irq = abs(irq); irq = irqs[irq & 0x0f]; if (irq == 0) { snd_printk(KERN_ERR "Error! IRQ isn't defined.\n"); |
