Skip to content

Commit

Permalink
ALSA: gus: use swap() in snd_ics_put_double()
Browse files Browse the repository at this point in the history
Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Fabian Frederick authored and tiwai committed Jun 12, 2015
1 parent a038b97 commit 1b12e4c
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions sound/isa/gus/gus_mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand Down

0 comments on commit 1b12e4c

Please sign in to comment.