Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 377a4f7e authored by Peter Eriksen's avatar Peter Eriksen Committed by Jaroslav Kysela
Browse files

[ALSA] sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x. 




Signed-off-by: default avatarPeter Eriksen <s022018@student.dtu.dk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent cd7509a4

sound/isa/gus/gus_main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 */

		gus->mix_cntrl_reg |= 4;	/* enable MIC */

	}

	}

	dma1 = gus->gf1.dma1;

	dma1 = gus->gf1.dma1;

	dma1 = dma1 < 0 ? -dma1 : dma1;

	dma1 = abs(dma1);

	dma1 = dmas[dma1 & 7];

	dma1 = dmas[dma1 & 7];

	dma2 = gus->gf1.dma2;

	dma2 = gus->gf1.dma2;

	dma2 = dma2 < 0 ? -dma2 : dma2;

	dma2 = abs(dma2);

	dma2 = dmas[dma2 & 7];

	dma2 = dmas[dma2 & 7];

	dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3);

	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;

		return -EINVAL;

	}

	}

	irq = gus->gf1.irq;

	irq = gus->gf1.irq;

	irq = irq < 0 ? -irq : irq;

	irq = abs(irq);

	irq = irqs[irq & 0x0f];

	irq = irqs[irq & 0x0f];

	if (irq == 0) {

	if (irq == 0) {

		snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");

		snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");