Commit 904e6da1 authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Takashi Iwai
Browse files

ALSA: usb-audio: scarlett2: Remove repeated device info comments 



Document the fields of struct scarlett2_device_info in the definition
of the struct, not in each instantiation.

Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/3486e4d38973333d4ec38f32578c16a9f97bf6c8.1624294591.git.g@b4.vu


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6fd9d695

sound/usb/mixer_scarlett_gen2.c

+17 −16
Original line number Diff line number Diff line
@@ -218,10 +218,24 @@ struct scarlett2_ports { 


struct scarlett2_device_info {

	u32 usb_id; /* USB device identifier */

	u8 line_out_hw_vol; /* line out hw volume is sw controlled */

	u8 level_input_count; /* inputs with level selectable */

	u8 pad_input_count; /* inputs with pad selectable */



	/* line out hw volume is sw controlled */

	u8 line_out_hw_vol;



	/* the number of analogue inputs with a software switchable

	 * level control that can be set to line or instrument

	 */

	u8 level_input_count;



	/* the number of analogue inputs with a software switchable

	 * 10dB pad control

	 */

	u8 pad_input_count;



	/* additional description for the line out volume controls */

	const char * const line_out_descrs[SCARLETT2_ANALOGUE_MAX];



	/* port count and type data */

	struct scarlett2_ports ports[SCARLETT2_PORT_TYPE_COUNT];

};
@@ -260,12 +274,7 @@ struct scarlett2_data { 
static const struct scarlett2_device_info s6i6_gen2_info = {

	.usb_id = USB_ID(0x1235, 0x8203),



	/* The first two analogue inputs can be switched between line

	 * and instrument levels.

	 */

	.level_input_count = 2,



	/* The first two analogue inputs have an optional pad. */

	.pad_input_count = 2,



	.line_out_descrs = {
@@ -315,12 +324,7 @@ static const struct scarlett2_device_info s6i6_gen2_info = { 
static const struct scarlett2_device_info s18i8_gen2_info = {

	.usb_id = USB_ID(0x1235, 0x8204),



	/* The first two analogue inputs can be switched between line

	 * and instrument levels.

	 */

	.level_input_count = 2,



	/* The first four analogue inputs have an optional pad. */

	.pad_input_count = 4,



	.line_out_descrs = {
@@ -378,9 +382,6 @@ static const struct scarlett2_device_info s18i8_gen2_info = { 
static const struct scarlett2_device_info s18i20_gen2_info = {

	.usb_id = USB_ID(0x1235, 0x8201),



	/* The analogue line outputs on the 18i20 can be switched

	 * between software and hardware volume control

	 */

	.line_out_hw_vol = 1,



	.line_out_descrs = {