From baa15bd17bb57a68add5126585c51ee427584678 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Mon, 22 Oct 2012 23:43:53 +0200 Subject: [PATCH] svolume_arm: Fix a const warning. CC libpulsecore_2.98_la-svolume_arm.lo pulsecore/svolume_arm.c: In function 'pa_volume_s16ne_arm': pulsecore/svolume_arm.c:50:8: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Peter Meerwald --- src/pulsecore/svolume_arm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c index f06a70215..08b33888e 100644 --- a/src/pulsecore/svolume_arm.c +++ b/src/pulsecore/svolume_arm.c @@ -41,13 +41,10 @@ " movcs r6, r0 \n\t" static void pa_volume_s16ne_arm(int16_t *samples, const int32_t *volumes, unsigned channels, unsigned length) { - int32_t *ve; - /* Channels must be at least 4, and always a multiple of the original number. * This is also the max amount we overread the volume array, which should * have enough padding. */ - channels = channels == 3 ? 6 : PA_MAX (4U, channels); - ve = volumes + channels; + const int32_t *ve = volumes + (channels == 3 ? 6 : PA_MAX (4U, channels)); __asm__ __volatile__ ( " mov r6, %1 \n\t" /* r6 = volumes */