Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
authored by
Kuninori Morimoto
and committed by
Takashi Iwai
7f3ef3ab
f0fe4663
+16
-16
+16
-16
sound/usb/mixer_us16x08.c
+16
-16
sound/usb/mixer_us16x08.c
···
180
180
static int snd_us16x08_route_get(struct snd_kcontrol *kcontrol,
181
181
struct snd_ctl_elem_value *ucontrol)
182
182
{
183
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
183
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
184
184
int index = ucontrol->id.index;
185
185
186
186
/* route has no bias */
···
192
192
static int snd_us16x08_route_put(struct snd_kcontrol *kcontrol,
193
193
struct snd_ctl_elem_value *ucontrol)
194
194
{
195
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
195
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
196
196
struct snd_usb_audio *chip = elem->head.mixer->chip;
197
197
int index = ucontrol->id.index;
198
198
char buf[sizeof(route_msg)];
···
249
249
static int snd_us16x08_master_get(struct snd_kcontrol *kcontrol,
250
250
struct snd_ctl_elem_value *ucontrol)
251
251
{
252
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
252
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
253
253
int index = ucontrol->id.index;
254
254
255
255
ucontrol->value.integer.value[0] = elem->cache_val[index];
···
260
260
static int snd_us16x08_master_put(struct snd_kcontrol *kcontrol,
261
261
struct snd_ctl_elem_value *ucontrol)
262
262
{
263
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
263
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
264
264
struct snd_usb_audio *chip = elem->head.mixer->chip;
265
265
char buf[sizeof(mix_msg_out)];
266
266
int val, err;
···
297
297
static int snd_us16x08_bus_put(struct snd_kcontrol *kcontrol,
298
298
struct snd_ctl_elem_value *ucontrol)
299
299
{
300
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
300
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
301
301
struct snd_usb_audio *chip = elem->head.mixer->chip;
302
302
char buf[sizeof(mix_msg_out)];
303
303
int val, err = 0;
···
338
338
static int snd_us16x08_bus_get(struct snd_kcontrol *kcontrol,
339
339
struct snd_ctl_elem_value *ucontrol)
340
340
{
341
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
341
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
342
342
343
343
switch (elem->head.id) {
344
344
case SND_US16X08_ID_BUSS_OUT:
···
359
359
static int snd_us16x08_channel_get(struct snd_kcontrol *kcontrol,
360
360
struct snd_ctl_elem_value *ucontrol)
361
361
{
362
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
362
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
363
363
int index = ucontrol->id.index;
364
364
365
365
ucontrol->value.integer.value[0] = elem->cache_val[index];
···
370
370
static int snd_us16x08_channel_put(struct snd_kcontrol *kcontrol,
371
371
struct snd_ctl_elem_value *ucontrol)
372
372
{
373
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
373
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
374
374
struct snd_usb_audio *chip = elem->head.mixer->chip;
375
375
char buf[sizeof(mix_msg_in)];
376
376
int val, err;
···
417
417
static int snd_us16x08_comp_get(struct snd_kcontrol *kcontrol,
418
418
struct snd_ctl_elem_value *ucontrol)
419
419
{
420
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
420
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
421
421
struct snd_us16x08_comp_store *store = elem->private_data;
422
422
int index = ucontrol->id.index;
423
423
int val_idx = COMP_STORE_IDX(elem->head.id);
···
430
430
static int snd_us16x08_comp_put(struct snd_kcontrol *kcontrol,
431
431
struct snd_ctl_elem_value *ucontrol)
432
432
{
433
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
433
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
434
434
struct snd_usb_audio *chip = elem->head.mixer->chip;
435
435
struct snd_us16x08_comp_store *store = elem->private_data;
436
436
int index = ucontrol->id.index;
···
485
485
struct snd_ctl_elem_value *ucontrol)
486
486
{
487
487
int val;
488
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
488
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
489
489
struct snd_us16x08_eq_store *store = elem->private_data;
490
490
int index = ucontrol->id.index;
491
491
···
500
500
static int snd_us16x08_eqswitch_put(struct snd_kcontrol *kcontrol,
501
501
struct snd_ctl_elem_value *ucontrol)
502
502
{
503
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
503
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
504
504
struct snd_usb_audio *chip = elem->head.mixer->chip;
505
505
struct snd_us16x08_eq_store *store = elem->private_data;
506
506
int index = ucontrol->id.index;
···
544
544
struct snd_ctl_elem_value *ucontrol)
545
545
{
546
546
int val;
547
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
547
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
548
548
struct snd_us16x08_eq_store *store = elem->private_data;
549
549
int index = ucontrol->id.index;
550
550
int b_idx = EQ_STORE_BAND_IDX(elem->head.id) - 1;
···
560
560
static int snd_us16x08_eq_put(struct snd_kcontrol *kcontrol,
561
561
struct snd_ctl_elem_value *ucontrol)
562
562
{
563
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
563
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
564
564
struct snd_usb_audio *chip = elem->head.mixer->chip;
565
565
struct snd_us16x08_eq_store *store = elem->private_data;
566
566
int index = ucontrol->id.index;
···
684
684
struct snd_ctl_elem_value *ucontrol)
685
685
{
686
686
int i, set;
687
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
687
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
688
688
struct snd_usb_audio *chip = elem->head.mixer->chip;
689
689
struct snd_us16x08_meter_store *store = elem->private_data;
690
690
u8 meter_urb[64] = {0};
···
744
744
static int snd_us16x08_meter_put(struct snd_kcontrol *kcontrol,
745
745
struct snd_ctl_elem_value *ucontrol)
746
746
{
747
-
struct usb_mixer_elem_info *elem = kcontrol->private_data;
747
+
struct usb_mixer_elem_info *elem = snd_kcontrol_chip(kcontrol);
748
748
struct snd_us16x08_meter_store *store = elem->private_data;
749
749
int val;
750
750