Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b12e4ca authored by Fabian Frederick's avatar Fabian Frederick Committed by Takashi Iwai
Browse files

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: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a038b979

sound/isa/gus/gus_mixer.c

+3 −6
Original line number Diff line number Diff line
@@ -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));