summaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-06-12 18:58:59 +0200
committerTakashi Iwai <tiwai@suse.de>2015-06-12 20:46:29 +0200
commit1b12e4cac979d20ced54f519d170b58c80e58d6e (patch)
tree46259256f767fedb7f5be8448a1003c4c25f2e8d /sound/isa
parenta038b97951d399685e18a6dc53dee62b42134a0a (diff)
downloadlinux-stable-1b12e4cac979d20ced54f519d170b58c80e58d6e.tar.gz
linux-stable-1b12e4cac979d20ced54f519d170b58c80e58d6e.tar.bz2
linux-stable-1b12e4cac979d20ced54f519d170b58c80e58d6e.zip
ALSA: gus: use swap() in snd_ics_put_double()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/gus/gus_mixer.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c
index 0dd43414016e..3b5d9a7a63eb 100644
--- a/sound/isa/gus/gus_mixer.c
+++ b/sound/isa/gus/gus_mixer.c
@@ -109,7 +109,7 @@ static int snd_ics_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
unsigned long flags;
int addr = kcontrol->private_value & 0xff;
int change;
- unsigned char val1, val2, oval1, oval2, tmp;
+ unsigned char val1, val2, oval1, oval2;
val1 = ucontrol->value.integer.value[0] & 127;
val2 = ucontrol->value.integer.value[1] & 127;
@@ -120,11 +120,8 @@ static int snd_ics_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
gus->gf1.ics_regs[addr][0] = val1;
gus->gf1.ics_regs[addr][1] = val2;
if (gus->ics_flag && gus->ics_flipped &&
- (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV)) {
- tmp = val1;
- val1 = val2;
- val2 = tmp;
- }
+ (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV))
+ swap(val1, val2);
addr <<= 3;
outb(addr | 0, GUSP(gus, MIXCNTRLPORT));
outb(1, GUSP(gus, MIXDATAPORT));