Skip to content

Commit 7f3ef3a

Browse files
morimototiwai
morimoto
authored and
tiwai
committed
ALSA: usb: mixer_us16x08: 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/87frhhaucf.wl-kuninori.morimoto.gx@renesas.com
1 parent f0fe466 commit 7f3ef3a

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

‎sound/usb/mixer_us16x08.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int snd_us16x08_route_info(struct snd_kcontrol *kcontrol,
180180
static int snd_us16x08_route_get(struct snd_kcontrol *kcontrol,
181181
struct snd_ctl_elem_value *ucontrol)
182182
{
183-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
183+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
184184
int index = ucontrol->id.index;
185185

186186
/* route has no bias */
@@ -192,7 +192,7 @@ static int snd_us16x08_route_get(struct snd_kcontrol *kcontrol,
192192
static int snd_us16x08_route_put(struct snd_kcontrol *kcontrol,
193193
struct snd_ctl_elem_value *ucontrol)
194194
{
195-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
195+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
196196
struct snd_usb_audio *chip = elem->head.mixer->chip;
197197
int index = ucontrol->id.index;
198198
char buf[sizeof(route_msg)];
@@ -249,7 +249,7 @@ static int snd_us16x08_master_info(struct snd_kcontrol *kcontrol,
249249
static int snd_us16x08_master_get(struct snd_kcontrol *kcontrol,
250250
struct snd_ctl_elem_value *ucontrol)
251251
{
252-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
252+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
253253
int index = ucontrol->id.index;
254254

255255
ucontrol->value.integer.value[0] = elem->cache_val[index];
@@ -260,7 +260,7 @@ static int snd_us16x08_master_get(struct snd_kcontrol *kcontrol,
260260
static int snd_us16x08_master_put(struct snd_kcontrol *kcontrol,
261261
struct snd_ctl_elem_value *ucontrol)
262262
{
263-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
263+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
264264
struct snd_usb_audio *chip = elem->head.mixer->chip;
265265
char buf[sizeof(mix_msg_out)];
266266
int val, err;
@@ -297,7 +297,7 @@ static int snd_us16x08_master_put(struct snd_kcontrol *kcontrol,
297297
static int snd_us16x08_bus_put(struct snd_kcontrol *kcontrol,
298298
struct snd_ctl_elem_value *ucontrol)
299299
{
300-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
300+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
301301
struct snd_usb_audio *chip = elem->head.mixer->chip;
302302
char buf[sizeof(mix_msg_out)];
303303
int val, err = 0;
@@ -338,7 +338,7 @@ static int snd_us16x08_bus_put(struct snd_kcontrol *kcontrol,
338338
static int snd_us16x08_bus_get(struct snd_kcontrol *kcontrol,
339339
struct snd_ctl_elem_value *ucontrol)
340340
{
341-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
341+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
342342

343343
switch (elem->head.id) {
344344
case SND_US16X08_ID_BUSS_OUT:
@@ -359,7 +359,7 @@ static int snd_us16x08_bus_get(struct snd_kcontrol *kcontrol,
359359
static int snd_us16x08_channel_get(struct snd_kcontrol *kcontrol,
360360
struct snd_ctl_elem_value *ucontrol)
361361
{
362-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
362+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
363363
int index = ucontrol->id.index;
364364

365365
ucontrol->value.integer.value[0] = elem->cache_val[index];
@@ -370,7 +370,7 @@ static int snd_us16x08_channel_get(struct snd_kcontrol *kcontrol,
370370
static int snd_us16x08_channel_put(struct snd_kcontrol *kcontrol,
371371
struct snd_ctl_elem_value *ucontrol)
372372
{
373-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
373+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
374374
struct snd_usb_audio *chip = elem->head.mixer->chip;
375375
char buf[sizeof(mix_msg_in)];
376376
int val, err;
@@ -417,7 +417,7 @@ static int snd_us16x08_mix_info(struct snd_kcontrol *kcontrol,
417417
static int snd_us16x08_comp_get(struct snd_kcontrol *kcontrol,
418418
struct snd_ctl_elem_value *ucontrol)
419419
{
420-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
420+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
421421
struct snd_us16x08_comp_store *store = elem->private_data;
422422
int index = ucontrol->id.index;
423423
int val_idx = COMP_STORE_IDX(elem->head.id);
@@ -430,7 +430,7 @@ static int snd_us16x08_comp_get(struct snd_kcontrol *kcontrol,
430430
static int snd_us16x08_comp_put(struct snd_kcontrol *kcontrol,
431431
struct snd_ctl_elem_value *ucontrol)
432432
{
433-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
433+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
434434
struct snd_usb_audio *chip = elem->head.mixer->chip;
435435
struct snd_us16x08_comp_store *store = elem->private_data;
436436
int index = ucontrol->id.index;
@@ -485,7 +485,7 @@ static int snd_us16x08_eqswitch_get(struct snd_kcontrol *kcontrol,
485485
struct snd_ctl_elem_value *ucontrol)
486486
{
487487
int val;
488-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
488+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
489489
struct snd_us16x08_eq_store *store = elem->private_data;
490490
int index = ucontrol->id.index;
491491

@@ -500,7 +500,7 @@ static int snd_us16x08_eqswitch_get(struct snd_kcontrol *kcontrol,
500500
static int snd_us16x08_eqswitch_put(struct snd_kcontrol *kcontrol,
501501
struct snd_ctl_elem_value *ucontrol)
502502
{
503-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
503+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
504504
struct snd_usb_audio *chip = elem->head.mixer->chip;
505505
struct snd_us16x08_eq_store *store = elem->private_data;
506506
int index = ucontrol->id.index;
@@ -544,7 +544,7 @@ static int snd_us16x08_eq_get(struct snd_kcontrol *kcontrol,
544544
struct snd_ctl_elem_value *ucontrol)
545545
{
546546
int val;
547-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
547+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
548548
struct snd_us16x08_eq_store *store = elem->private_data;
549549
int index = ucontrol->id.index;
550550
int b_idx = EQ_STORE_BAND_IDX(elem->head.id) - 1;
@@ -560,7 +560,7 @@ static int snd_us16x08_eq_get(struct snd_kcontrol *kcontrol,
560560
static int snd_us16x08_eq_put(struct snd_kcontrol *kcontrol,
561561
struct snd_ctl_elem_value *ucontrol)
562562
{
563-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
563+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
564564
struct snd_usb_audio *chip = elem->head.mixer->chip;
565565
struct snd_us16x08_eq_store *store = elem->private_data;
566566
int index = ucontrol->id.index;
@@ -684,7 +684,7 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,
684684
struct snd_ctl_elem_value *ucontrol)
685685
{
686686
int i, set;
687-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
687+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
688688
struct snd_usb_audio *chip = elem->head.mixer->chip;
689689
struct snd_us16x08_meter_store *store = elem->private_data;
690690
u8 meter_urb[64] = {0};
@@ -744,7 +744,7 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol,
744744
static int snd_us16x08_meter_put(struct snd_kcontrol *kcontrol,
745745
struct snd_ctl_elem_value *ucontrol)
746746
{
747-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
747+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
748748
struct snd_us16x08_meter_store *store = elem->private_data;
749749
int val;
750750

0 commit comments

Comments
 (0)