mirror of https://gitee.com/openkylin/linux.git
staging: line6: Call *_disconnect() via pointer
Which *_disconnect() to call on disconnect is known at initialization. Add a function pointer to the `usb_line6' struct and use to call into the appropriate logic instead of evaluating the conditional logic. Signed-off-by: Chris Rorvick <chris@rorvick.com> Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
01f6b2bc6a
commit
a46c467251
|
@ -1017,48 +1017,7 @@ static void line6_disconnect(struct usb_interface *interface)
|
|||
dev_err(line6->ifcdev,
|
||||
"driver bug: inconsistent usb device\n");
|
||||
|
||||
switch (line6->type) {
|
||||
case LINE6_BASSPODXT:
|
||||
case LINE6_BASSPODXTLIVE:
|
||||
case LINE6_BASSPODXTPRO:
|
||||
case LINE6_POCKETPOD:
|
||||
case LINE6_PODXT:
|
||||
case LINE6_PODXTPRO:
|
||||
line6_pod_disconnect(interface);
|
||||
break;
|
||||
|
||||
case LINE6_PODHD300:
|
||||
case LINE6_PODHD400:
|
||||
case LINE6_PODHD500_0:
|
||||
case LINE6_PODHD500_1:
|
||||
line6_podhd_disconnect(interface);
|
||||
break;
|
||||
|
||||
case LINE6_PODXTLIVE_POD:
|
||||
line6_pod_disconnect(interface);
|
||||
break;
|
||||
|
||||
case LINE6_PODXTLIVE_VARIAX:
|
||||
line6_variax_disconnect(interface);
|
||||
break;
|
||||
|
||||
case LINE6_VARIAX:
|
||||
line6_variax_disconnect(interface);
|
||||
break;
|
||||
|
||||
case LINE6_PODSTUDIO_GX:
|
||||
case LINE6_PODSTUDIO_UX1:
|
||||
case LINE6_PODSTUDIO_UX2:
|
||||
case LINE6_TONEPORT_GX:
|
||||
case LINE6_TONEPORT_UX1:
|
||||
case LINE6_TONEPORT_UX2:
|
||||
case LINE6_GUITARPORT:
|
||||
line6_toneport_disconnect(interface);
|
||||
break;
|
||||
|
||||
default:
|
||||
MISSING_CASE;
|
||||
}
|
||||
line6->disconnect(interface);
|
||||
|
||||
dev_info(&interface->dev, "Line6 %s now disconnected\n",
|
||||
line6->properties->name);
|
||||
|
|
|
@ -196,6 +196,7 @@ struct usb_line6 {
|
|||
int message_length;
|
||||
|
||||
void (*process_message)(struct usb_line6 *);
|
||||
void (*disconnect)(struct usb_interface *);
|
||||
};
|
||||
|
||||
extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1,
|
||||
|
|
|
@ -360,6 +360,7 @@ static int pod_try_init(struct usb_interface *interface,
|
|||
struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
|
||||
|
||||
line6->process_message = line6_pod_process_message;
|
||||
line6->disconnect = line6_pod_disconnect;
|
||||
|
||||
init_timer(&pod->startup_timer);
|
||||
INIT_WORK(&pod->startup_work, pod_startup4);
|
||||
|
|
|
@ -98,6 +98,8 @@ static int podhd_try_init(struct usb_interface *interface,
|
|||
if ((interface == NULL) || (podhd == NULL))
|
||||
return -ENODEV;
|
||||
|
||||
line6->disconnect = line6_podhd_disconnect;
|
||||
|
||||
/* initialize audio system: */
|
||||
err = line6_init_audio(line6);
|
||||
if (err < 0)
|
||||
|
|
|
@ -347,6 +347,8 @@ static int toneport_try_init(struct usb_interface *interface,
|
|||
if ((interface == NULL) || (toneport == NULL))
|
||||
return -ENODEV;
|
||||
|
||||
line6->disconnect = line6_toneport_disconnect;
|
||||
|
||||
/* initialize audio system: */
|
||||
err = line6_init_audio(line6);
|
||||
if (err < 0)
|
||||
|
|
|
@ -181,6 +181,7 @@ static int variax_try_init(struct usb_interface *interface,
|
|||
int err;
|
||||
|
||||
line6->process_message = line6_variax_process_message;
|
||||
line6->disconnect = line6_variax_disconnect;
|
||||
|
||||
init_timer(&variax->startup_timer1);
|
||||
init_timer(&variax->startup_timer2);
|
||||
|
|
Loading…
Reference in New Issue