diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 16:58:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 16:58:00 -0700 |
| commit | 027360c5644b59d99db30e3515a8ec72350207b9 (patch) | |
| tree | 2d5f307fec534fc6e76135121e4c1f8f517d6922 /drivers/staging/line6/toneport.c | |
| parent | 79be7254ebd2fb6d5f91b4b8e5d12cfe4fd7ecd7 (diff) | |
Staging: line6: minor coding style cleanups
This fixes up all of the remaining coding style issues that
make any sense to make in the line6 driver.
Cc: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/toneport.c')
| -rw-r--r-- | drivers/staging/line6/toneport.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c index d4ac734d744..6a10b0f9749 100644 --- a/drivers/staging/line6/toneport.c +++ b/drivers/staging/line6/toneport.c @@ -349,24 +349,20 @@ static int toneport_try_init(struct usb_interface *interface, /* initialize audio system: */ err = line6_init_audio(line6); - if (err < 0) { + if (err < 0) return err; - } /* initialize PCM subsystem: */ err = line6_init_pcm(line6, &toneport_pcm_properties); - if (err < 0) { + if (err < 0) return err; - } /* register monitor control: */ - err = - snd_ctl_add(line6->card, - snd_ctl_new1(&toneport_control_monitor, - line6->line6pcm)); - if (err < 0) { + err = snd_ctl_add(line6->card, + snd_ctl_new1(&toneport_control_monitor, + line6->line6pcm)); + if (err < 0) return err; - } /* register source select control: */ switch (usbdev->descriptor.idProduct) { @@ -376,16 +372,14 @@ static int toneport_try_init(struct usb_interface *interface, snd_ctl_add(line6->card, snd_ctl_new1(&toneport_control_source, line6->line6pcm)); - if (err < 0) { + if (err < 0) return err; - } } /* register audio system: */ err = line6_register_audio(line6); - if (err < 0) { + if (err < 0) return err; - } line6_read_serial_number(line6, &toneport->serial_number); line6_read_data(line6, 0x80c2, &toneport->firmware_version, 1); @@ -416,9 +410,8 @@ int line6_toneport_init(struct usb_interface *interface, { int err = toneport_try_init(interface, toneport); - if (err < 0) { + if (err < 0) toneport_destruct(interface); - } return err; } |