redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Chris Rorvick 2015-02-07 10:43:18 -06:00 committed by Takashi Iwai
parent 89444601e5
commit f2bd242fa1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/usb/line6/toneport.c
View File

@ -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;