tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ALSA: usb: mixer: use snd_kcontrol_chip()

We can use snd_kcontrol_chip(). Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/87msbpaud1.wl-kuninori.morimoto.gx@renesas.com

authored by

Kuninori Morimoto and committed by
Takashi Iwai 3abd2e16 27c464a8

+11 -11
+11 -11
sound/usb/mixer.c
··· 547 547 int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, 548 548 unsigned int size, unsigned int __user *_tlv) 549 549 { 550 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 550 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 551 551 DECLARE_TLV_DB_MINMAX(scale, 0, 0); 552 552 553 553 if (size < sizeof(scale)) ··· 1367 1367 static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, 1368 1368 struct snd_ctl_elem_info *uinfo) 1369 1369 { 1370 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 1370 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 1371 1371 1372 1372 if (cval->val_type == USB_MIXER_BOOLEAN || 1373 1373 cval->val_type == USB_MIXER_INV_BOOLEAN) ··· 1399 1399 static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, 1400 1400 struct snd_ctl_elem_value *ucontrol) 1401 1401 { 1402 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 1402 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 1403 1403 int c, cnt, val, err; 1404 1404 1405 1405 ucontrol->value.integer.value[0] = cval->min; ··· 1431 1431 static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, 1432 1432 struct snd_ctl_elem_value *ucontrol) 1433 1433 { 1434 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 1434 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 1435 1435 int max_val = get_max_exposed(cval); 1436 1436 int c, cnt, val, oval, err; 1437 1437 int changed = 0; ··· 1475 1475 static int mixer_ctl_master_bool_get(struct snd_kcontrol *kcontrol, 1476 1476 struct snd_ctl_elem_value *ucontrol) 1477 1477 { 1478 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 1478 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 1479 1479 int val, err; 1480 1480 1481 1481 err = snd_usb_get_cur_mix_value(cval, 0, 0, &val); ··· 1543 1543 static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol, 1544 1544 struct snd_ctl_elem_value *ucontrol) 1545 1545 { 1546 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 1546 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 1547 1547 int ret, val; 1548 1548 1549 1549 ret = get_connector_value(cval, kcontrol->id.name, &val); ··· 2302 2302 static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, 2303 2303 struct snd_ctl_elem_value *ucontrol) 2304 2304 { 2305 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 2305 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 2306 2306 int err, val; 2307 2307 2308 2308 err = get_cur_ctl_value(cval, cval->control << 8, &val); ··· 2319 2319 static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, 2320 2320 struct snd_ctl_elem_value *ucontrol) 2321 2321 { 2322 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 2322 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 2323 2323 int val, oval, err; 2324 2324 2325 2325 err = get_cur_ctl_value(cval, cval->control << 8, &oval); ··· 2654 2654 static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, 2655 2655 struct snd_ctl_elem_info *uinfo) 2656 2656 { 2657 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 2657 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 2658 2658 const char **itemlist = (const char **)kcontrol->private_value; 2659 2659 2660 2660 if (snd_BUG_ON(!itemlist)) ··· 2666 2666 static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, 2667 2667 struct snd_ctl_elem_value *ucontrol) 2668 2668 { 2669 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 2669 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 2670 2670 int val, err; 2671 2671 2672 2672 err = get_cur_ctl_value(cval, cval->control << 8, &val); ··· 2683 2683 static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, 2684 2684 struct snd_ctl_elem_value *ucontrol) 2685 2685 { 2686 - struct usb_mixer_elem_info *cval = kcontrol->private_data; 2686 + struct usb_mixer_elem_info *cval = snd_kcontrol_chip(kcontrol); 2687 2687 int val, oval, err; 2688 2688 2689 2689 err = get_cur_ctl_value(cval, cval->control << 8, &oval);