The patch titled
sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x.
has been removed from the -mm tree. Its filename was
sound-isa-gus-gus_mainc-use-abs-instead-of-x-0-x-x.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x.
From: "Peter Eriksen" <s022018@xxxxxxxxxxxxxx>
Signed-off-by: Peter Eriksen <s022018@xxxxxxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/isa/gus/gus_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN sound/isa/gus/gus_main.c~sound-isa-gus-gus_mainc-use-abs-instead-of-x-0-x-x sound/isa/gus/gus_main.c
--- a/sound/isa/gus/gus_main.c~sound-isa-gus-gus_mainc-use-abs-instead-of-x-0-x-x
+++ a/sound/isa/gus/gus_main.c
@@ -294,10 +294,10 @@ static int snd_gus_init_dma_irq(struct s
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 s
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");
_
Patches currently in -mm which might be from s022018@xxxxxxxxxxxxxx are
git-alsa.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
