aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/class/audio.c
diff options
context:
space:
mode:
authorJesper Juhl <juhl-lkml@dif.dk>2005-04-18 17:39:34 -0700
committerGreg K-H <gregkh@suse.de>2005-04-18 17:39:34 -0700
commit1bc3c9e1e44c2059fe2ffa6ff70ad0a925d7b05f (patch)
tree0bc14ec53acf3b4c08a9995c7ea335e236435558 /drivers/usb/class/audio.c
parent6fd19f4b55f7fd1c9d8650bd7f8df2c81b69c5ca (diff)
[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL
Get rid of a bunch of redundant NULL pointer checks in drivers/usb/*, there's no need to check a pointer for NULL before calling kfree() on it. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Index: gregkh-2.6/drivers/usb/class/audio.c ===================================================================
Diffstat (limited to 'drivers/usb/class/audio.c')
-rw-r--r--drivers/usb/class/audio.c48
1 files changed, 16 insertions, 32 deletions
diff --git a/drivers/usb/class/audio.c b/drivers/usb/class/audio.c
index f432b7d5b23..f8f21567cc2 100644
--- a/drivers/usb/class/audio.c
+++ b/drivers/usb/class/audio.c
@@ -649,14 +649,10 @@ static void usbin_stop(struct usb_audiodev *as)
}
}
set_current_state(TASK_RUNNING);
- if (u->durb[0].urb->transfer_buffer)
- kfree(u->durb[0].urb->transfer_buffer);
- if (u->durb[1].urb->transfer_buffer)
- kfree(u->durb[1].urb->transfer_buffer);
- if (u->surb[0].urb->transfer_buffer)
- kfree(u->surb[0].urb->transfer_buffer);
- if (u->surb[1].urb->transfer_buffer)
- kfree(u->surb[1].urb->transfer_buffer);
+ kfree(u->durb[0].urb->transfer_buffer);
+ kfree(u->durb[1].urb->transfer_buffer);
+ kfree(u->surb[0].urb->transfer_buffer);
+ kfree(u->surb[1].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = u->durb[1].urb->transfer_buffer =
u->surb[0].urb->transfer_buffer = u->surb[1].urb->transfer_buffer = NULL;
}
@@ -1009,21 +1005,17 @@ static int usbin_start(struct usb_audiodev *as)
u->phase = 0;
maxsze = (u->freqmax + 0x3fff) >> (14 - AFMT_BYTESSHIFT(u->format));
bufsz = DESCFRAMES * maxsze;
- if (u->durb[0].urb->transfer_buffer)
- kfree(u->durb[0].urb->transfer_buffer);
+ kfree(u->durb[0].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[0].urb->transfer_buffer_length = bufsz;
- if (u->durb[1].urb->transfer_buffer)
- kfree(u->durb[1].urb->transfer_buffer);
+ kfree(u->durb[1].urb->transfer_buffer);
u->durb[1].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[1].urb->transfer_buffer_length = bufsz;
if (u->syncpipe) {
- if (u->surb[0].urb->transfer_buffer)
- kfree(u->surb[0].urb->transfer_buffer);
+ kfree(u->surb[0].urb->transfer_buffer);
u->surb[0].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[0].urb->transfer_buffer_length = 3*SYNCFRAMES;
- if (u->surb[1].urb->transfer_buffer)
- kfree(u->surb[1].urb->transfer_buffer);
+ kfree(u->surb[1].urb->transfer_buffer);
u->surb[1].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[1].urb->transfer_buffer_length = 3*SYNCFRAMES;
}
@@ -1128,14 +1120,10 @@ static void usbout_stop(struct usb_audiodev *as)
}
}
set_current_state(TASK_RUNNING);
- if (u->durb[0].urb->transfer_buffer)
- kfree(u->durb[0].urb->transfer_buffer);
- if (u->durb[1].urb->transfer_buffer)
- kfree(u->durb[1].urb->transfer_buffer);
- if (u->surb[0].urb->transfer_buffer)
- kfree(u->surb[0].urb->transfer_buffer);
- if (u->surb[1].urb->transfer_buffer)
- kfree(u->surb[1].urb->transfer_buffer);
+ kfree(u->durb[0].urb->transfer_buffer);
+ kfree(u->durb[1].urb->transfer_buffer);
+ kfree(u->surb[0].urb->transfer_buffer);
+ kfree(u->surb[1].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = u->durb[1].urb->transfer_buffer =
u->surb[0].urb->transfer_buffer = u->surb[1].urb->transfer_buffer = NULL;
}
@@ -1376,21 +1364,17 @@ static int usbout_start(struct usb_audiodev *as)
u->phase = 0;
maxsze = (u->freqmax + 0x3fff) >> (14 - AFMT_BYTESSHIFT(u->format));
bufsz = DESCFRAMES * maxsze;
- if (u->durb[0].urb->transfer_buffer)
- kfree(u->durb[0].urb->transfer_buffer);
+ kfree(u->durb[0].urb->transfer_buffer);
u->durb[0].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[0].urb->transfer_buffer_length = bufsz;
- if (u->durb[1].urb->transfer_buffer)
- kfree(u->durb[1].urb->transfer_buffer);
+ kfree(u->durb[1].urb->transfer_buffer);
u->durb[1].urb->transfer_buffer = kmalloc(bufsz, GFP_KERNEL);
u->durb[1].urb->transfer_buffer_length = bufsz;
if (u->syncpipe) {
- if (u->surb[0].urb->transfer_buffer)
- kfree(u->surb[0].urb->transfer_buffer);
+ kfree(u->surb[0].urb->transfer_buffer);
u->surb[0].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[0].urb->transfer_buffer_length = 3*SYNCFRAMES;
- if (u->surb[1].urb->transfer_buffer)
- kfree(u->surb[1].urb->transfer_buffer);
+ kfree(u->surb[1].urb->transfer_buffer);
u->surb[1].urb->transfer_buffer = kmalloc(3*SYNCFRAMES, GFP_KERNEL);
u->surb[1].urb->transfer_buffer_length = 3*SYNCFRAMES;
}