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

Commit f87426e0 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela
Browse files

ALSA: opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx() 



Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx().
Drop check of card->private_data which cannot be NULL
if card is not NULL (spotted by Rene Herman).

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent c0874449

sound/isa/opl3sa2.c

+5 −27
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id) 
	struct snd_opl3sa2 *chip;

	int handled = 0;



	if (card == NULL || card->private_data == NULL)

	if (card == NULL)

		return IRQ_NONE;



	chip = card->private_data;
@@ -338,29 +338,18 @@ static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id) 


#define OPL3SA2_SINGLE(xname, xindex, reg, shift, mask, invert) \

{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \

  .info = snd_opl3sa2_info_single, \

  .info = snd_wss_info_single, \

  .get = snd_opl3sa2_get_single, .put = snd_opl3sa2_put_single, \

  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }

#define OPL3SA2_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \

{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \

  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \

  .name = xname, .index = xindex, \

  .info = snd_opl3sa2_info_single, \

  .info = snd_wss_info_single, \

  .get = snd_opl3sa2_get_single, .put = snd_opl3sa2_put_single, \

  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24), \

  .tlv = { .p = (xtlv) } }



static int snd_opl3sa2_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	int mask = (kcontrol->private_value >> 16) & 0xff;



	uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 1;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = mask;

	return 0;

}



static int snd_opl3sa2_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);
@@ -404,29 +393,18 @@ static int snd_opl3sa2_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_ 


#define OPL3SA2_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \

{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \

  .info = snd_opl3sa2_info_double, \

  .info = snd_wss_info_double, \

  .get = snd_opl3sa2_get_double, .put = snd_opl3sa2_put_double, \

  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }

#define OPL3SA2_DOUBLE_TLV(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert, xtlv) \

{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \

  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \

  .name = xname, .index = xindex, \

  .info = snd_opl3sa2_info_double, \

  .info = snd_wss_info_double, \

  .get = snd_opl3sa2_get_double, .put = snd_opl3sa2_put_double, \

  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22), \

  .tlv = { .p = (xtlv) } }



static int snd_opl3sa2_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	int mask = (kcontrol->private_value >> 24) & 0xff;



	uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 2;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = mask;

	return 0;

}



static int snd_opl3sa2_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);