Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2bd242f authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai
Browse files

ALSA: line6: Pass toneport pointer to toneport_has_led() 



It is unlikely this function would ever be used in a context without a
pointer to a `struct usb_line6_toneport', so grab the device type from
it rather than having the caller do it.

Signed-off-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 89444601

sound/usb/line6/toneport.c

+12 −7
Original line number Diff line number Diff line
@@ -278,12 +278,17 @@ static struct snd_kcontrol_new toneport_control_source = { 
	(void cmd_0x02(byte red, byte green)

*/



static bool toneport_has_led(enum line6_device_type type)

static bool toneport_has_led(struct usb_line6_toneport *toneport)

{

	return

	    (type == LINE6_GUITARPORT) ||

	    (type == LINE6_TONEPORT_GX);

	switch (toneport->type) {

	case LINE6_GUITARPORT:

	case LINE6_TONEPORT_GX:

	/* add your device here if you are missing support for the LEDs */

		return true;



	default:

		return false;

	}

}



static const char * const led_colors[2] = { "red", "green" };
@@ -379,7 +384,7 @@ static void toneport_setup(struct usb_line6_toneport *toneport) 
				  toneport_source_info[toneport->source].code,

				  0x0000);



	if (toneport_has_led(toneport->type))

	if (toneport_has_led(toneport))

		toneport_update_led(toneport);



	mod_timer(&toneport->timer, jiffies + TONEPORT_PCM_DELAY * HZ);
@@ -395,7 +400,7 @@ static void line6_toneport_disconnect(struct usb_line6 *line6) 


	del_timer_sync(&toneport->timer);



	if (toneport_has_led(toneport->type))

	if (toneport_has_led(toneport))

		toneport_remove_leds(toneport);

}
@@ -440,7 +445,7 @@ static int toneport_init(struct usb_line6 *line6, 
	line6_read_serial_number(line6, &toneport->serial_number);

	line6_read_data(line6, 0x80c2, &toneport->firmware_version, 1);



	if (toneport_has_led(toneport->type)) {

	if (toneport_has_led(toneport)) {

		err = toneport_init_leds(toneport);

		if (err < 0)

			return err;