raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

ALSA: usb-audio: Fix code alignment in mixer_quirks

Browse Source 
[ Upstream commit bca638aa73 ]

Format code to fix all alignment issues reported by checkpatch.pl:

  CHECK: Alignment should match open parenthesis

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250526-dualsense-alsa-jack-v1-1-1a821463b632@collabora.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Cristian Ciocaltea
2025-05-26 17:07:40 +03:00
committed by Greg Kroah-Hartman
parent f8ae651299
commit 2ea8b2ce48
1 changed files with 127 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sound/usb/mixer_quirks.c
View File

@@ -116,7 +116,8 @@ static int snd_create_std_mono_ctl(struct usb_mixer_interface *mixer,
snd_kcontrol_tlv_rw_t *tlv_callback) snd_kcontrol_tlv_rw_t *tlv_callback)
{ {
return snd_create_std_mono_ctl_offset(mixer, unitid, control, cmask, return snd_create_std_mono_ctl_offset(mixer, unitid, control, cmask,
val_type, 0 /* Offset */, name, tlv_callback); val_type, 0 /* Offset */,
name, tlv_callback);
} }
/* /*
@@ -129,7 +130,8 @@ static int snd_create_std_mono_table(struct usb_mixer_interface *mixer,
while (t->name != NULL) { while (t->name != NULL) {
err = snd_create_std_mono_ctl(mixer, t->unitid, t->control, err = snd_create_std_mono_ctl(mixer, t->unitid, t->control,
t->cmask, t->val_type, t->name, t->tlv_callback); t->cmask, t->val_type, t->name,
t->tlv_callback);
if (err < 0) if (err < 0)
return err; return err;
t++; t++;
@@ -3962,8 +3964,8 @@ static int snd_djm_controls_update(struct usb_mixer_interface *mixer,
if (err) if (err)
return err; return err;
err = snd_usb_ctl_msg( err = snd_usb_ctl_msg(mixer->chip->dev,
mixer->chip->dev, usb_sndctrlpipe(mixer->chip->dev, 0), usb_sndctrlpipe(mixer->chip->dev, 0),
USB_REQ_SET_FEATURE, USB_REQ_SET_FEATURE,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
device->controls[group].options[value], device->controls[group].options[value],
@@ -4028,10 +4030,10 @@ static int snd_djm_controls_create(struct usb_mixer_interface *mixer,
for (i = 0; i < device->ncontrols; i++) { for (i = 0; i < device->ncontrols; i++) {
value = device->controls[i].default_value; value = device->controls[i].default_value;
knew.name = device->controls[i].name; knew.name = device->controls[i].name;
knew.private_value = ( knew.private_value =
((unsigned long)device_idx << SND_DJM_DEVICE_SHIFT) | ((unsigned long)device_idx << SND_DJM_DEVICE_SHIFT) |
(i << SND_DJM_GROUP_SHIFT) | (i << SND_DJM_GROUP_SHIFT) |
value); value;
err = snd_djm_controls_update(mixer, device_idx, i, value); err = snd_djm_controls_update(mixer, device_idx, i, value);
if (err) if (err)
return err; return err;
@@ -4098,13 +4100,15 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
break; break;
case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */ case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */
err = snd_nativeinstruments_create_mixer(mixer, err = snd_nativeinstruments_create_mixer(/* checkpatch hack */
mixer,
snd_nativeinstruments_ta6_mixers, snd_nativeinstruments_ta6_mixers,
ARRAY_SIZE(snd_nativeinstruments_ta6_mixers)); ARRAY_SIZE(snd_nativeinstruments_ta6_mixers));
break; break;
case USB_ID(0x17cc, 0x1021): /* Traktor Audio 10 */ case USB_ID(0x17cc, 0x1021): /* Traktor Audio 10 */
err = snd_nativeinstruments_create_mixer(mixer, err = snd_nativeinstruments_create_mixer(/* checkpatch hack */
mixer,
snd_nativeinstruments_ta10_mixers, snd_nativeinstruments_ta10_mixers,
ARRAY_SIZE(snd_nativeinstruments_ta10_mixers)); ARRAY_SIZE(snd_nativeinstruments_ta10_mixers));
break; break;