From: Geoffrey D. Bennett Date: Fri, 4 Oct 2024 14:28:12 +0000 (+0930) Subject: ALSA: scarlett2: Fix mixed declarations and code warning X-Git-Tag: v6.13-rc1~123^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c293089af7de1393af9efd2eb3354b10703670e;p=thirdparty%2Flinux.git ALSA: scarlett2: Fix mixed declarations and code warning In scarlett2_compressor_ctl_put(), move the declaration of param to the beginning of the function to avoid mixed declarations and code. Signed-off-by: Geoffrey D. Bennett Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/ede84092737fa2ca7e94371135cc1e42f1731e84.1727971672.git.g@b4.vu --- diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c index 003e91f9e43c7..aa7c3d74ce8f1 100644 --- a/sound/usb/mixer_scarlett2.c +++ b/sound/usb/mixer_scarlett2.c @@ -5385,6 +5385,8 @@ static int scarlett2_compressor_ctl_put( int index = elem->control; int channel = index / SCARLETT2_COMPRESSOR_PARAM_COUNT; int param_index = index % SCARLETT2_COMPRESSOR_PARAM_COUNT; + const struct compressor_param *param = &compressor_params[param_index]; + int oval, val, err; s32 scaled_val; @@ -5406,8 +5408,6 @@ static int scarlett2_compressor_ctl_put( private->compressor_values[index] = val; - const struct compressor_param *param = &compressor_params[param_index]; - scaled_val = val << param->scale_bits; /* Send change to the device */