lkml.org 
[lkml]   [2007]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH] sound/isa/gus/gus_main.c: Use abs() instead of x < 0 ? -x : x.

    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    ---
    There are only a few places using the conditional operator in the
    meaning of the absolute value, and this is is one such place.

    Compile tested only.

    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 b680fdd..8ced5e8 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");
    --
    1.5.0.rc2.g19605-dirty
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-01-27 01:43    [W:0.047 / U:29.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site