diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-06-12 12:58:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-06-12 14:46:29 -0400 |
commit | 1b12e4cac979d20ced54f519d170b58c80e58d6e (patch) | |
tree | 46259256f767fedb7f5be8448a1003c4c25f2e8d /sound/isa | |
parent | a038b97951d399685e18a6dc53dee62b42134a0a (diff) |
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.c | 9 |
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 | |||
109 | unsigned long flags; | 109 | unsigned long flags; |
110 | int addr = kcontrol->private_value & 0xff; | 110 | int addr = kcontrol->private_value & 0xff; |
111 | int change; | 111 | int change; |
112 | unsigned char val1, val2, oval1, oval2, tmp; | 112 | unsigned char val1, val2, oval1, oval2; |
113 | 113 | ||
114 | val1 = ucontrol->value.integer.value[0] & 127; | 114 | val1 = ucontrol->value.integer.value[0] & 127; |
115 | val2 = ucontrol->value.integer.value[1] & 127; | 115 | 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 | |||
120 | gus->gf1.ics_regs[addr][0] = val1; | 120 | gus->gf1.ics_regs[addr][0] = val1; |
121 | gus->gf1.ics_regs[addr][1] = val2; | 121 | gus->gf1.ics_regs[addr][1] = val2; |
122 | if (gus->ics_flag && gus->ics_flipped && | 122 | if (gus->ics_flag && gus->ics_flipped && |
123 | (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV)) { | 123 | (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV)) |
124 | tmp = val1; | 124 | swap(val1, val2); |
125 | val1 = val2; | ||
126 | val2 = tmp; | ||
127 | } | ||
128 | addr <<= 3; | 125 | addr <<= 3; |
129 | outb(addr | 0, GUSP(gus, MIXCNTRLPORT)); | 126 | outb(addr | 0, GUSP(gus, MIXCNTRLPORT)); |
130 | outb(1, GUSP(gus, MIXDATAPORT)); | 127 | outb(1, GUSP(gus, MIXDATAPORT)); |