Commit 1cad3e8d authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai

staging: line6: Pass *_process_message() `usb_line6' pointers

Casting the `struct usb_line6' pointer at the call point makes the code
difficult to read.  This is substantially cleaned up by moving the cast
into the callees.
Signed-off-by: default avatarChris Rorvick <chris@rorvick.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a221dd45
...@@ -544,8 +544,7 @@ static void line6_data_received(struct urb *urb) ...@@ -544,8 +544,7 @@ static void line6_data_received(struct urb *urb)
case LINE6_PODXT: case LINE6_PODXT:
case LINE6_PODXTPRO: case LINE6_PODXTPRO:
case LINE6_POCKETPOD: case LINE6_POCKETPOD:
line6_pod_process_message((struct usb_line6_pod *) line6_pod_process_message(line6);
line6);
break; break;
case LINE6_PODHD300: case LINE6_PODHD300:
...@@ -555,19 +554,15 @@ static void line6_data_received(struct urb *urb) ...@@ -555,19 +554,15 @@ static void line6_data_received(struct urb *urb)
break; /* let userspace handle MIDI */ break; /* let userspace handle MIDI */
case LINE6_PODXTLIVE_POD: case LINE6_PODXTLIVE_POD:
line6_pod_process_message((struct usb_line6_pod line6_pod_process_message(line6);
*)line6);
break; break;
case LINE6_PODXTLIVE_VARIAX: case LINE6_PODXTLIVE_VARIAX:
line6_variax_process_message((struct line6_variax_process_message(line6);
usb_line6_variax
*)line6);
break; break;
case LINE6_VARIAX: case LINE6_VARIAX:
line6_variax_process_message((struct usb_line6_variax *) line6_variax_process_message(line6);
line6);
break; break;
default: default:
......
...@@ -131,8 +131,9 @@ static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code, ...@@ -131,8 +131,9 @@ static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
/* /*
Process a completely received message. Process a completely received message.
*/ */
void line6_pod_process_message(struct usb_line6_pod *pod) void line6_pod_process_message(struct usb_line6 *line6)
{ {
struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
const unsigned char *buf = pod->line6.buffer_message; const unsigned char *buf = pod->line6.buffer_message;
if (memcmp(buf, pod_version_header, sizeof(pod_version_header)) == 0) { if (memcmp(buf, pod_version_header, sizeof(pod_version_header)) == 0) {
......
...@@ -89,6 +89,6 @@ struct usb_line6_pod { ...@@ -89,6 +89,6 @@ struct usb_line6_pod {
extern void line6_pod_disconnect(struct usb_interface *interface); extern void line6_pod_disconnect(struct usb_interface *interface);
extern int line6_pod_init(struct usb_interface *interface, extern int line6_pod_init(struct usb_interface *interface,
struct usb_line6 *line6); struct usb_line6 *line6);
extern void line6_pod_process_message(struct usb_line6_pod *pod); extern void line6_pod_process_message(struct usb_line6 *line6);
#endif #endif
...@@ -130,8 +130,9 @@ static void variax_startup6(struct work_struct *work) ...@@ -130,8 +130,9 @@ static void variax_startup6(struct work_struct *work)
/* /*
Process a completely received message. Process a completely received message.
*/ */
void line6_variax_process_message(struct usb_line6_variax *variax) void line6_variax_process_message(struct usb_line6 *line6)
{ {
struct usb_line6_variax *variax = (struct usb_line6_variax *) line6;
const unsigned char *buf = variax->line6.buffer_message; const unsigned char *buf = variax->line6.buffer_message;
switch (buf[0]) { switch (buf[0]) {
......
...@@ -67,6 +67,6 @@ struct usb_line6_variax { ...@@ -67,6 +67,6 @@ struct usb_line6_variax {
extern void line6_variax_disconnect(struct usb_interface *interface); extern void line6_variax_disconnect(struct usb_interface *interface);
extern int line6_variax_init(struct usb_interface *interface, extern int line6_variax_init(struct usb_interface *interface,
struct usb_line6 *line6); struct usb_line6 *line6);
extern void line6_variax_process_message(struct usb_line6_variax *variax); extern void line6_variax_process_message(struct usb_line6 *line6);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment