summaryrefslogtreecommitdiff
path: root/drivers/staging/line6/pod.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-09-21 23:58:00 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-21 23:58:00 (GMT)
commit027360c5644b59d99db30e3515a8ec72350207b9 (patch)
tree2d5f307fec534fc6e76135121e4c1f8f517d6922 /drivers/staging/line6/pod.c
parent79be7254ebd2fb6d5f91b4b8e5d12cfe4fd7ecd7 (diff)
downloadlinux-fsl-qoriq-027360c5644b59d99db30e3515a8ec72350207b9.tar.xz
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/pod.c')
-rw-r--r--drivers/staging/line6/pod.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index e6a1c79..22e2ced 100644
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -1242,35 +1242,29 @@ static int pod_try_init(struct usb_interface *interface,
/* create sysfs entries: */
err = pod_create_files2(&interface->dev);
- if (err < 0) {
+ if (err < 0)
return err;
- }
/* initialize audio system: */
err = line6_init_audio(line6);
- if (err < 0) {
+ if (err < 0)
return err;
- }
/* initialize MIDI subsystem: */
err = line6_init_midi(line6);
- if (err < 0) {
+ if (err < 0)
return err;
- }
/* initialize PCM subsystem: */
err = line6_init_pcm(line6, &pod_pcm_properties);
- if (err < 0) {
+ if (err < 0)
return err;
- }
/* register monitor control: */
- err =
- snd_ctl_add(line6->card,
- snd_ctl_new1(&pod_control_monitor, line6->line6pcm));
- if (err < 0) {
+ err = snd_ctl_add(line6->card,
+ snd_ctl_new1(&pod_control_monitor, line6->line6pcm));
+ if (err < 0)
return err;
- }
/*
When the sound card is registered at this point, the PODxt Live
@@ -1295,9 +1289,8 @@ int line6_pod_init(struct usb_interface *interface, struct usb_line6_pod *pod)
{
int err = pod_try_init(interface, pod);
- if (err < 0) {
+ if (err < 0)
pod_destruct(interface);
- }
return err;
}
@@ -1317,9 +1310,8 @@ void line6_pod_disconnect(struct usb_interface *interface)
struct snd_line6_pcm *line6pcm = pod->line6.line6pcm;
struct device *dev = &interface->dev;
- if (line6pcm != NULL) {
+ if (line6pcm != NULL)
line6_pcm_disconnect(line6pcm);
- }
if (dev != NULL) {
/* remove sysfs entries: */