[ALSA] sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x.
authorPeter Eriksen <s022018@student.dtu.dk>
Mon, 29 Jan 2007 13:45:53 +0000 (14:45 +0100)
committerJaroslav Kysela <perex@suse.cz>
Fri, 9 Feb 2007 08:03:13 +0000 (09:03 +0100)
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>
sound/isa/gus/gus_main.c

index b680fddf0d740f86aebd7998c10ad632055b22fa..8ced5e81b9a7049371aa968901c696a5d8e840f1 100644 (file)
@@ -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");