renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Chris Rorvick 2015-01-12 12:42:56 -08:00 committed by Takashi Iwai
parent 16d603d32d
commit a221dd453a
9 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/line6/driver.c
View File

@ -959,33 +959,26 @@ static int line6_probe(struct usb_interface *interface,
case LINE6_POCKETPOD: case LINE6_POCKETPOD:
case LINE6_PODXT: case LINE6_PODXT:
case LINE6_PODXTPRO: case LINE6_PODXTPRO:
ret = line6_pod_init(interface, (struct usb_line6_pod *)line6); ret = line6_pod_init(interface, line6);
break; break;
case LINE6_PODHD300: case LINE6_PODHD300:
case LINE6_PODHD400: case LINE6_PODHD400:
case LINE6_PODHD500_0: case LINE6_PODHD500_0:
case LINE6_PODHD500_1: case LINE6_PODHD500_1:
ret = line6_podhd_init(interface, ret = line6_podhd_init(interface, line6);
(struct usb_line6_podhd *)line6);
break; break;
case LINE6_PODXTLIVE_POD: case LINE6_PODXTLIVE_POD:
ret = ret = line6_pod_init(interface, line6);
line6_pod_init(interface,
(struct usb_line6_pod *)line6);
break; break;
case LINE6_PODXTLIVE_VARIAX: case LINE6_PODXTLIVE_VARIAX:
ret = ret = line6_variax_init(interface, line6);
line6_variax_init(interface,
(struct usb_line6_variax *)line6);
break; break;
case LINE6_VARIAX: case LINE6_VARIAX:
ret = ret = line6_variax_init(interface, line6);
line6_variax_init(interface,
(struct usb_line6_variax *)line6);
break; break;
case LINE6_PODSTUDIO_GX: case LINE6_PODSTUDIO_GX:
@ -995,9 +988,7 @@ static int line6_probe(struct usb_interface *interface,
case LINE6_TONEPORT_UX1: case LINE6_TONEPORT_UX1:
case LINE6_TONEPORT_UX2: case LINE6_TONEPORT_UX2:
case LINE6_GUITARPORT: case LINE6_GUITARPORT:
ret = ret = line6_toneport_init(interface, line6);
line6_toneport_init(interface,
(struct usb_line6_toneport *)line6);
break; break;
default: default:

8
drivers/staging/line6/pod.c
View File

@ -353,10 +353,10 @@ static int pod_create_files2(struct device *dev)
Try to init POD device. Try to init POD device.
*/ */
static int pod_try_init(struct usb_interface *interface, static int pod_try_init(struct usb_interface *interface,
struct usb_line6_pod *pod) struct usb_line6 *line6)
{ {
int err; int err;
struct usb_line6 *line6 = &pod->line6; struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
init_timer(&pod->startup_timer); init_timer(&pod->startup_timer);
INIT_WORK(&pod->startup_work, pod_startup4); INIT_WORK(&pod->startup_work, pod_startup4);
@ -409,9 +409,9 @@ static int pod_try_init(struct usb_interface *interface,
/* /*
Init POD device (and clean up in case of failure). Init POD device (and clean up in case of failure).
*/ */
int line6_pod_init(struct usb_interface *interface, struct usb_line6_pod *pod) int line6_pod_init(struct usb_interface *interface, struct usb_line6 *line6)
{ {
int err = pod_try_init(interface, pod); int err = pod_try_init(interface, line6);
if (err < 0) if (err < 0)
pod_destruct(interface); pod_destruct(interface);

2
drivers/staging/line6/pod.h
View File

@ -88,7 +88,7 @@ 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_pod *pod); struct usb_line6 *line6);
extern void line6_pod_process_message(struct usb_line6_pod *pod); extern void line6_pod_process_message(struct usb_line6_pod *pod);
#endif #endif

4
drivers/staging/line6/podhd.c
View File

@ -121,9 +121,9 @@ static int podhd_try_init(struct usb_interface *interface,
/* /*
Init POD HD device (and clean up in case of failure). Init POD HD device (and clean up in case of failure).
*/ */
int line6_podhd_init(struct usb_interface *interface, int line6_podhd_init(struct usb_interface *interface, struct usb_line6 *line6)
struct usb_line6_podhd *podhd)
{ {
struct usb_line6_podhd *podhd = (struct usb_line6_podhd *) line6;
int err = podhd_try_init(interface, podhd); int err = podhd_try_init(interface, podhd);
if (err < 0) if (err < 0)

2
drivers/staging/line6/podhd.h
View File

@ -25,6 +25,6 @@ struct usb_line6_podhd {
extern void line6_podhd_disconnect(struct usb_interface *interface); extern void line6_podhd_disconnect(struct usb_interface *interface);
extern int line6_podhd_init(struct usb_interface *interface, extern int line6_podhd_init(struct usb_interface *interface,
struct usb_line6_podhd *podhd); struct usb_line6 *line6);
#endif /* PODHD_H */ #endif /* PODHD_H */

8
drivers/staging/line6/toneport.c
View File

@ -339,10 +339,10 @@ static void toneport_setup(struct usb_line6_toneport *toneport)
Try to init Toneport device. Try to init Toneport device.
*/ */
static int toneport_try_init(struct usb_interface *interface, static int toneport_try_init(struct usb_interface *interface,
struct usb_line6_toneport *toneport) struct usb_line6 *line6)
{ {
int err; int err;
struct usb_line6 *line6 = &toneport->line6; struct usb_line6_toneport *toneport = (struct usb_line6_toneport *) line6;
if ((interface == NULL) || (toneport == NULL)) if ((interface == NULL) || (toneport == NULL))
return -ENODEV; return -ENODEV;
@ -411,9 +411,9 @@ static int toneport_try_init(struct usb_interface *interface,
Init Toneport device (and clean up in case of failure). Init Toneport device (and clean up in case of failure).
*/ */
int line6_toneport_init(struct usb_interface *interface, int line6_toneport_init(struct usb_interface *interface,
struct usb_line6_toneport *toneport) struct usb_line6 *line6)
{ {
int err = toneport_try_init(interface, toneport); int err = toneport_try_init(interface, line6);
if (err < 0) if (err < 0)
toneport_destruct(interface); toneport_destruct(interface);

2
drivers/staging/line6/toneport.h
View File

@ -46,7 +46,7 @@ struct usb_line6_toneport {
extern void line6_toneport_disconnect(struct usb_interface *interface); extern void line6_toneport_disconnect(struct usb_interface *interface);
extern int line6_toneport_init(struct usb_interface *interface, extern int line6_toneport_init(struct usb_interface *interface,
struct usb_line6_toneport *toneport); struct usb_line6 *line6);
extern void line6_toneport_reset_resume(struct usb_line6_toneport *toneport); extern void line6_toneport_reset_resume(struct usb_line6_toneport *toneport);
#endif #endif

8
drivers/staging/line6/variax.c
View File

@ -174,8 +174,9 @@ static void variax_destruct(struct usb_interface *interface)
Try to init workbench device. Try to init workbench device.
*/ */
static int variax_try_init(struct usb_interface *interface, static int variax_try_init(struct usb_interface *interface,
struct usb_line6_variax *variax) struct usb_line6 *line6)
{ {
struct usb_line6_variax *variax = (struct usb_line6_variax *) line6;
int err; int err;
init_timer(&variax->startup_timer1); init_timer(&variax->startup_timer1);
@ -212,10 +213,9 @@ static int variax_try_init(struct usb_interface *interface,
/* /*
Init workbench device (and clean up in case of failure). Init workbench device (and clean up in case of failure).
*/ */
int line6_variax_init(struct usb_interface *interface, int line6_variax_init(struct usb_interface *interface, struct usb_line6 *line6)
struct usb_line6_variax *variax)
{ {
int err = variax_try_init(interface, variax); int err = variax_try_init(interface, line6);
if (err < 0) if (err < 0)
variax_destruct(interface); variax_destruct(interface);

2
drivers/staging/line6/variax.h
View File

@ -66,7 +66,7 @@ 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_variax *variax); struct usb_line6 *line6);
extern void line6_variax_process_message(struct usb_line6_variax *variax); extern void line6_variax_process_message(struct usb_line6_variax *variax);
#endif #endif