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: 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>

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 08f80515733082e8d6c1d4a5533e3fcd5ed5311a..369e60e070e11a11982141f8c1c69eb4aa7a6821 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -544,8 +544,7 @@ static void line6_data_received(struct urb *urb)
                case LINE6_PODXT:
                case LINE6_PODXTPRO:
                case LINE6_POCKETPOD:
-                       line6_pod_process_message((struct usb_line6_pod *)
-                                                 line6);
+                       line6_pod_process_message(line6);
                        break;
 
                case LINE6_PODHD300:
@@ -555,19 +554,15 @@ static void line6_data_received(struct urb *urb)
                        break; /* let userspace handle MIDI */
 
                case LINE6_PODXTLIVE_POD:
-                       line6_pod_process_message((struct usb_line6_pod
-                                                          *)line6);
+                       line6_pod_process_message(line6);
                        break;
 
                case LINE6_PODXTLIVE_VARIAX:
-                       line6_variax_process_message((struct
-                                                     usb_line6_variax
-                                                     *)line6);
+                       line6_variax_process_message(line6);
                        break;
 
                case LINE6_VARIAX:
-                       line6_variax_process_message((struct usb_line6_variax *)
-                                                    line6);
+                       line6_variax_process_message(line6);
                        break;
 
                default:

diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index 9292b7215d646773475f876960baed49d8b91252..aa8977d1814f38fee53ad8a9f35b2e0f554fb04b 100644 (file)
--- 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,
 /*
        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;
 
        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 cf6c75cd67605834aed942b256f8f4eda84a6898..984a00bd294ddf8bf2dba36fdf353e82399358fd 100644 (file)
--- a/drivers/staging/line6/pod.h
+++ b/drivers/staging/line6/pod.h
@@ -89,6 +89,6 @@ struct usb_line6_pod {
 extern void line6_pod_disconnect(struct usb_interface *interface);
 extern int line6_pod_init(struct usb_interface *interface,
                          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

diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index f5b618bc3dbe9cd29c0d8baa2d8ac9f943eb2436..4d419940a6bb8e2e7ce7520e0648e936867245d2 100644 (file)
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -130,8 +130,9 @@ static void variax_startup6(struct work_struct *work)
 /*
        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;
 
        switch (buf[0]) {

diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h
index 9bf1464d45ec12f027459b3bba38c36c716e5566..7d445ff8c9dca7cd0261b168a35ce4df2cd3a864 100644 (file)
--- a/drivers/staging/line6/variax.h
+++ b/drivers/staging/line6/variax.h
@@ -67,6 +67,6 @@ struct usb_line6_variax {
 extern void line6_variax_disconnect(struct usb_interface *interface);
 extern int line6_variax_init(struct usb_interface *interface,
                             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