This patch converts code that uses kmalloc() and memset() to get a zeroed
memory block to use kcalloc() instead in media, misc, and net directories
of drivers/usb/.
Rediffed against 2.6.10-rc1-bk1.
Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
---
media/dabusb.c | 5 ++---
media/ov511.c | 6 ++----
media/se401.c | 6 ++----
media/sn9c102_core.c | 8 +++-----
media/stv680.c | 7 ++-----
media/usbvideo.c | 3 +--
media/vicam.c | 5 +----
media/w9968cf.c | 14 ++++----------
misc/auerswald.c | 3 +--
misc/cytherm.c | 3 +--
misc/phidgetservo.c | 3 +--
misc/usbled.c | 3 +--
misc/usbtest.c | 9 +++------
net/usbnet.c | 3 +--
14 files changed, 25 insertions(+), 53 deletions(-)
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/dabusb.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/dabusb.c 2004-10-23 22:08:17.849076744
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/dabusb.c 2004-10-23 22:12:52.778281152
+0300
@@ -218,12 +218,11 @@
pipesize, packets, transfer_buffer_length);
while (buffers < (s->total_buffer_size << 10)) {
- b = (pbuff_t) kmalloc (sizeof (buff_t), GFP_KERNEL);
+ b = kcalloc (1, sizeof (*b), GFP_KERNEL);
if (!b) {
- err("kmalloc(sizeof(buff_t))==NULL");
+ err("kcalloc(sizeof(*b))==NULL");
goto err;
}
- memset (b, 0, sizeof (buff_t));
b->s = s;
b->purb = usb_alloc_urb(packets, GFP_KERNEL);
if (!b->purb) {
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/ov511.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/ov511.c 2004-10-23 22:07:58.794973408
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/ov511.c 2004-10-23 22:12:52.783280392
+0300
@@ -5805,13 +5805,11 @@
if (idesc->bInterfaceSubClass != 0x00)
return -ENODEV;
- if ((ov = kmalloc(sizeof(*ov), GFP_KERNEL)) == NULL) {
- err("couldn't kmalloc ov struct");
+ if ((ov = kcalloc(1, sizeof(*ov), GFP_KERNEL)) == NULL) {
+ err("couldn't kcalloc ov struct");
goto error_out;
}
- memset(ov, 0, sizeof(*ov));
-
ov->dev = dev;
ov->iface = idesc->bInterfaceNumber;
ov->led_policy = led;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/se401.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/se401.c 2004-10-23 22:07:58.796973104
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/se401.c 2004-10-23 22:12:52.784280240
+0300
@@ -1343,13 +1343,11 @@
/* We found one */
info("SE401 camera found: %s", camera_name);
- if ((se401 = kmalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {
- err("couldn't kmalloc se401 struct");
+ if ((se401 = kcalloc(1, sizeof(*se401), GFP_KERNEL)) == NULL) {
+ err("couldn't kcalloc se401 struct");
return -ENOMEM;
}
- memset(se401, 0, sizeof(*se401));
-
se401->dev = dev;
se401->iface = interface->bInterfaceNumber;
se401->camera_name = camera_name;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/sn9c102_core.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/sn9c102_core.c 2004-10-23
22:07:58.861963224 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/sn9c102_core.c 2004-10-23 22:12:52.786279936
+0300
@@ -2322,20 +2322,18 @@
if (i == n-1)
return -ENODEV;
- if (!(cam = kmalloc(sizeof(struct sn9c102_device), GFP_KERNEL)))
+ if (!(cam = kcalloc(1, sizeof(*cam), GFP_KERNEL)))
return -ENOMEM;
- memset(cam, 0, sizeof(*cam));
cam->usbdev = udev;
memcpy(&cam->dev, &udev->dev, sizeof(struct device));
- if (!(cam->control_buffer = kmalloc(8, GFP_KERNEL))) {
- DBG(1, "kmalloc() failed")
+ if (!(cam->control_buffer = kcalloc(1, 8, GFP_KERNEL))) {
+ DBG(1, "kcalloc() failed")
err = -ENOMEM;
goto fail;
}
- memset(cam->control_buffer, 0, 8);
if (!(cam->v4ldev = video_device_alloc())) {
DBG(1, "video_device_alloc() failed")
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/stv680.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/stv680.c 2004-10-23 22:07:58.900957296
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/stv680.c 2004-10-23 22:12:52.788279632
+0300
@@ -317,12 +317,11 @@
unsigned char *buffer;
unsigned long int bufsize;
- buffer = kmalloc (40, GFP_KERNEL);
+ buffer = kcalloc (1, 40, GFP_KERNEL);
if (buffer == NULL) {
PDEBUG (0, "STV(e): Out of (small buf) memory");
return -1;
}
- memset (buffer, 0, 40);
udelay (100);
/* set config 1, interface 0, alternate 0 */
@@ -1387,14 +1386,12 @@
goto error;
}
/* We found one */
- if ((stv680 = kmalloc (sizeof (*stv680), GFP_KERNEL)) == NULL) {
+ if ((stv680 = kcalloc (1, sizeof (*stv680), GFP_KERNEL)) == NULL) {
PDEBUG (0, "STV(e): couldn't kmalloc stv680 struct.");
retval = -ENOMEM;
goto error;
}
- memset (stv680, 0, sizeof (*stv680));
-
stv680->udev = dev;
stv680->camera_name = camera_name;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/usbvideo.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/usbvideo.c 2004-10-23
22:07:58.902956992 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/usbvideo.c 2004-10-23 22:12:52.790279328
+0300
@@ -763,14 +763,13 @@
}
base_size = num_cams * sizeof(struct uvd) + sizeof(struct usbvideo);
- cams = (struct usbvideo *) kmalloc(base_size, GFP_KERNEL);
+ cams = kcalloc(1, base_size, GFP_KERNEL);
if (cams == NULL) {
err("Failed to allocate %d. bytes for usbvideo struct", base_size);
return -ENOMEM;
}
dbg("%s: Allocated $%p (%d. bytes) for %d. cameras",
__FUNCTION__, cams, base_size, num_cams);
- memset(cams, 0, base_size);
/* Copy callbacks, apply defaults for those that are not set */
memmove(&cams->cb, cbTbl, sizeof(cams->cb));
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/vicam.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/vicam.c 2004-10-23 22:07:58.904956688
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/vicam.c 2004-10-23 22:12:52.791279176
+0300
@@ -1304,15 +1304,12 @@
"No bulk in endpoint was found ?! (this is bad)\n");
}
- if ((cam =
- kmalloc(sizeof (struct vicam_camera), GFP_KERNEL)) == NULL) {
+ if ((cam = kcalloc(1, sizeof (*cam), GFP_KERNEL)) == NULL) {
printk(KERN_WARNING
"could not allocate kernel memory for vicam_camera struct\n");
return -ENOMEM;
}
- memset(cam, 0, sizeof (struct vicam_camera));
-
cam->shutter_speed = 15;
init_MUTEX(&cam->cam_lock);
Index: 2.6.10-rc1-bk1-usb/drivers/usb/media/w9968cf.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/media/w9968cf.c 2004-10-23 22:07:58.908956080
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/media/w9968cf.c 2004-10-23 22:12:52.795278568
+0300
@@ -714,13 +714,12 @@
/* Allocate memory for the isochronous transfer buffers */
for (i = 0; i < W9968CF_URBS; i++) {
if (!(cam->transfer_buffer[i] =
- kmalloc(W9968CF_ISO_PACKETS*p_size, GFP_KERNEL))) {
+ kcalloc(W9968CF_ISO_PACKETS, p_size, GFP_KERNEL))) {
DBG(1, "Couldn't allocate memory for the isochronous "
"transfer buffers (%u bytes)",
p_size * W9968CF_ISO_PACKETS)
return -ENOMEM;
}
- memset(cam->transfer_buffer[i], 0, W9968CF_ISO_PACKETS*p_size);
}
/* Allocate memory for the temporary frame buffer */
@@ -3525,13 +3524,10 @@
else
return -ENODEV;
- cam = (struct w9968cf_device*)
- kmalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
+ cam = kcalloc(1, sizeof(*cam), GFP_KERNEL);
if (!cam)
return -ENOMEM;
- memset(cam, 0, sizeof(*cam));
-
init_MUTEX(&cam->dev_sem);
down(&cam->dev_sem);
@@ -3559,21 +3555,19 @@
/* Allocate 2 bytes of memory for camera control USB transfers */
- if (!(cam->control_buffer = (u16*)kmalloc(2, GFP_KERNEL))) {
+ if (!(cam->control_buffer = kcalloc(1, 2, GFP_KERNEL))) {
DBG(1,"Couldn't allocate memory for camera control transfers")
err = -ENOMEM;
goto fail;
}
- memset(cam->control_buffer, 0, 2);
/* Allocate 8 bytes of memory for USB data transfers to the FSB */
- if (!(cam->data_buffer = (u16*)kmalloc(8, GFP_KERNEL))) {
+ if (!(cam->data_buffer = kcalloc(1, 8, GFP_KERNEL))) {
DBG(1, "Couldn't allocate memory for data "
"transfers to the FSB")
err = -ENOMEM;
goto fail;
}
- memset(cam->data_buffer, 0, 8);
/* Register the V4L device */
cam->v4ldev = video_device_alloc();
Index: 2.6.10-rc1-bk1-usb/drivers/usb/misc/auerswald.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/misc/auerswald.c 2004-10-23
22:07:58.944950608 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/misc/auerswald.c 2004-10-23 22:12:52.797278264
+0300
@@ -571,10 +571,9 @@
/* fill the list of free elements */
for (;numElements; numElements--) {
- acep = (pauerchainelement_t) kmalloc (sizeof (auerchainelement_t),
GFP_KERNEL);
+ acep = kcalloc (1, sizeof (auerchainelement_t), GFP_KERNEL);
if (!acep)
goto ac_fail;
- memset (acep, 0, sizeof (auerchainelement_t));
INIT_LIST_HEAD (&acep->list);
list_add_tail (&acep->list, &acp->free_list);
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/misc/cytherm.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/misc/cytherm.c 2004-10-23 22:07:04.897167120
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/misc/cytherm.c 2004-10-23 22:12:52.798278112
+0300
@@ -352,12 +352,11 @@
struct usb_cytherm *dev = NULL;
int retval = -ENOMEM;
- dev = kmalloc (sizeof(struct usb_cytherm), GFP_KERNEL);
+ dev = kcalloc (1, sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
dev_err (&interface->dev, "Out of memory\n");
goto error;
}
- memset (dev, 0x00, sizeof (*dev));
dev->udev = usb_get_dev(udev);
Index: 2.6.10-rc1-bk1-usb/drivers/usb/misc/phidgetservo.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/misc/phidgetservo.c 2004-10-23
22:07:04.898166968 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/misc/phidgetservo.c 2004-10-23 22:12:52.799277960
+0300
@@ -255,12 +255,11 @@
struct usb_device *udev = interface_to_usbdev(interface);
struct phidget_servo *dev;
- dev = kmalloc(sizeof (struct phidget_servo), GFP_KERNEL);
+ dev = kcalloc(1, sizeof (*dev), GFP_KERNEL);
if (dev == NULL) {
dev_err(&interface->dev, "%s - out of memory\n", __FUNCTION__);
return -ENOMEM;
}
- memset(dev, 0x00, sizeof (*dev));
dev->udev = usb_get_dev(udev);
dev->type = id->driver_info;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/misc/usbled.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/misc/usbled.c 2004-10-23 22:07:04.921163472
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/misc/usbled.c 2004-10-23 22:12:52.801277656
+0300
@@ -109,12 +109,11 @@
struct usb_led *dev = NULL;
int retval = -ENOMEM;
- dev = kmalloc(sizeof(struct usb_led), GFP_KERNEL);
+ dev = kcalloc(1, sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
dev_err(&interface->dev, "Out of memory\n");
goto error;
}
- memset (dev, 0x00, sizeof (*dev));
dev->udev = usb_get_dev(udev);
Index: 2.6.10-rc1-bk1-usb/drivers/usb/misc/usbtest.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/misc/usbtest.c 2004-10-23 22:07:04.957158000
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/misc/usbtest.c 2004-10-23 22:12:52.802277504
+0300
@@ -378,20 +378,18 @@
unsigned i;
unsigned size = max;
- sg = kmalloc (nents * sizeof *sg, SLAB_KERNEL);
+ sg = kcalloc (nents, sizeof(*sg), SLAB_KERNEL);
if (!sg)
return NULL;
- memset (sg, 0, nents * sizeof *sg);
for (i = 0; i < nents; i++) {
char *buf;
- buf = kmalloc (size, SLAB_KERNEL);
+ buf = kcalloc (1, size, SLAB_KERNEL);
if (!buf) {
free_sglist (sg, i);
return NULL;
}
- memset (buf, 0, size);
/* kmalloc pages are always physically contiguous! */
sg [i].page = virt_to_page (buf);
@@ -850,10 +848,9 @@
* as with bulk/intr sglists, sglen is the queue depth; it also
* controls which subtests run (more tests than sglen) or rerun.
*/
- urb = kmalloc (param->sglen * sizeof (struct urb *), SLAB_KERNEL);
+ urb = kcalloc (param->sglen, sizeof (struct urb *), SLAB_KERNEL);
if (!urb)
goto cleanup;
- memset (urb, 0, param->sglen * sizeof (struct urb *));
for (i = 0; i < param->sglen; i++) {
int pipe = usb_rcvctrlpipe (udev, 0);
unsigned len;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/net/usbnet.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/net/usbnet.c 2004-10-23 22:12:29.930754504
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/net/usbnet.c 2004-10-23 22:12:52.815275528 +0300
@@ -749,13 +749,12 @@
return -ENOMEM;
}
- if ((data->int_buf = kmalloc(AX_INTERRUPT_BUFSIZE, GFP_KERNEL)) == NULL) {
+ if ((data->int_buf = kcalloc(1, AX_INTERRUPT_BUFSIZE, GFP_KERNEL)) == NULL) {
dbg ("%s: cannot allocate memory for interrupt buffer",
dev->net->name);
usb_free_urb(data->int_urb);
return -ENOMEM;
}
- memset(data->int_buf, 0, AX_INTERRUPT_BUFSIZE);
usb_fill_int_urb (data->int_urb, dev->udev,
usb_rcvintpipe (dev->udev, 1),
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
