aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/line6/driver.c13
-rw-r--r--drivers/staging/line6/pod.c3
-rw-r--r--drivers/staging/line6/pod.h2
-rw-r--r--drivers/staging/line6/variax.c3
-rw-r--r--drivers/staging/line6/variax.h2
5 files changed, 10 insertions, 13 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 08f805157330..369e60e070e1 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -544,8 +544,7 @@ static void line6_data_received(struct urb *urb)
544 case LINE6_PODXT: 544 case LINE6_PODXT:
545 case LINE6_PODXTPRO: 545 case LINE6_PODXTPRO:
546 case LINE6_POCKETPOD: 546 case LINE6_POCKETPOD:
547 line6_pod_process_message((struct usb_line6_pod *) 547 line6_pod_process_message(line6);
548 line6);
549 break; 548 break;
550 549
551 case LINE6_PODHD300: 550 case LINE6_PODHD300:
@@ -555,19 +554,15 @@ static void line6_data_received(struct urb *urb)
555 break; /* let userspace handle MIDI */ 554 break; /* let userspace handle MIDI */
556 555
557 case LINE6_PODXTLIVE_POD: 556 case LINE6_PODXTLIVE_POD:
558 line6_pod_process_message((struct usb_line6_pod 557 line6_pod_process_message(line6);
559 *)line6);
560 break; 558 break;
561 559
562 case LINE6_PODXTLIVE_VARIAX: 560 case LINE6_PODXTLIVE_VARIAX:
563 line6_variax_process_message((struct 561 line6_variax_process_message(line6);
564 usb_line6_variax
565 *)line6);
566 break; 562 break;
567 563
568 case LINE6_VARIAX: 564 case LINE6_VARIAX:
569 line6_variax_process_message((struct usb_line6_variax *) 565 line6_variax_process_message(line6);
570 line6);
571 break; 566 break;
572 567
573 default: 568 default:
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index 9292b7215d64..aa8977d1814f 100644
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -131,8 +131,9 @@ static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
131/* 131/*
132 Process a completely received message. 132 Process a completely received message.
133*/ 133*/
134void line6_pod_process_message(struct usb_line6_pod *pod) 134void line6_pod_process_message(struct usb_line6 *line6)
135{ 135{
136 struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
136 const unsigned char *buf = pod->line6.buffer_message; 137 const unsigned char *buf = pod->line6.buffer_message;
137 138
138 if (memcmp(buf, pod_version_header, sizeof(pod_version_header)) == 0) { 139 if (memcmp(buf, pod_version_header, sizeof(pod_version_header)) == 0) {
diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h
index cf6c75cd6760..984a00bd294d 100644
--- a/drivers/staging/line6/pod.h
+++ b/drivers/staging/line6/pod.h
@@ -89,6 +89,6 @@ struct usb_line6_pod {
89extern void line6_pod_disconnect(struct usb_interface *interface); 89extern void line6_pod_disconnect(struct usb_interface *interface);
90extern int line6_pod_init(struct usb_interface *interface, 90extern int line6_pod_init(struct usb_interface *interface,
91 struct usb_line6 *line6); 91 struct usb_line6 *line6);
92extern void line6_pod_process_message(struct usb_line6_pod *pod); 92extern void line6_pod_process_message(struct usb_line6 *line6);
93 93
94#endif 94#endif
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index f5b618bc3dbe..4d419940a6bb 100644
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -130,8 +130,9 @@ static void variax_startup6(struct work_struct *work)
130/* 130/*
131 Process a completely received message. 131 Process a completely received message.
132*/ 132*/
133void line6_variax_process_message(struct usb_line6_variax *variax) 133void line6_variax_process_message(struct usb_line6 *line6)
134{ 134{
135 struct usb_line6_variax *variax = (struct usb_line6_variax *) line6;
135 const unsigned char *buf = variax->line6.buffer_message; 136 const unsigned char *buf = variax->line6.buffer_message;
136 137
137 switch (buf[0]) { 138 switch (buf[0]) {
diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h
index 9bf1464d45ec..7d445ff8c9dc 100644
--- a/drivers/staging/line6/variax.h
+++ b/drivers/staging/line6/variax.h
@@ -67,6 +67,6 @@ struct usb_line6_variax {
67extern void line6_variax_disconnect(struct usb_interface *interface); 67extern void line6_variax_disconnect(struct usb_interface *interface);
68extern int line6_variax_init(struct usb_interface *interface, 68extern int line6_variax_init(struct usb_interface *interface,
69 struct usb_line6 *line6); 69 struct usb_line6 *line6);
70extern void line6_variax_process_message(struct usb_line6_variax *variax); 70extern void line6_variax_process_message(struct usb_line6 *line6);
71 71
72#endif 72#endif