diff options
| author | Geoffrey D. Bennett <g@b4.vu> | 2023-12-26 21:06:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-12-29 17:52:12 +0300 |
| commit | 4dedf7ca929a3f29fbed973e85372056d69a1848 (patch) | |
| tree | 3e82cb48f1d68800b738ff49cc66655568f79dbc /sound | |
| parent | d3cf557b26a77f6a285fe6b9b87c434ffb340ceb (diff) | |
| download | linux-4dedf7ca929a3f29fbed973e85372056d69a1848.tar.xz | |
ALSA: scarlett2: Remove repeated elem->head.mixer references
Use a local variable *mixer rather than repeating elem->header.mixer
in scarlett2_direct_monitor_ctl_get() and scarlett2_meter_ctl_get().
Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/b21bacf4056366e10e01077e224d2b4970fdfe31.1703612638.git.g@b4.vu
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/mixer_scarlett2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c index 6dd758cfb5cb..8f466ad82d5a 100644 --- a/sound/usb/mixer_scarlett2.c +++ b/sound/usb/mixer_scarlett2.c @@ -3927,7 +3927,7 @@ static int scarlett2_direct_monitor_ctl_get( { struct usb_mixer_elem_info *elem = kctl->private_data; struct usb_mixer_interface *mixer = elem->head.mixer; - struct scarlett2_data *private = elem->head.mixer->private_data; + struct scarlett2_data *private = mixer->private_data; int err = 0; mutex_lock(&private->data_mutex); @@ -4191,7 +4191,8 @@ static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol) { struct usb_mixer_elem_info *elem = kctl->private_data; - struct scarlett2_data *private = elem->head.mixer->private_data; + struct usb_mixer_interface *mixer = elem->head.mixer; + struct scarlett2_data *private = mixer->private_data; u8 *meter_level_map = private->meter_level_map; u16 meter_levels[SCARLETT2_MAX_METERS]; int i, err; @@ -4203,7 +4204,7 @@ static int scarlett2_meter_ctl_get(struct snd_kcontrol *kctl, goto unlock; } - err = scarlett2_usb_get_meter_levels(elem->head.mixer, elem->channels, + err = scarlett2_usb_get_meter_levels(mixer, elem->channels, meter_levels); if (err < 0) goto unlock; |