lkml.org 
[lkml]   [2006]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 04/13] USBATM: kzalloc conversion
Date
Convert kmalloc + memset to kzalloc.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Index: Linux/drivers/usb/atm/cxacru.c
===================================================================
--- Linux.orig/drivers/usb/atm/cxacru.c 2006-01-13 08:48:09.000000000 +0100
+++ Linux/drivers/usb/atm/cxacru.c 2006-01-13 08:51:00.000000000 +0100
@@ -673,14 +673,12 @@
int ret;

/* instance init */
- instance = kmalloc(sizeof(*instance), GFP_KERNEL);
+ instance = kzalloc(sizeof(*instance), GFP_KERNEL);
if (!instance) {
dbg("cxacru_bind: no memory for instance data");
return -ENOMEM;
}

- memset(instance, 0, sizeof(*instance));
-
instance->usbatm = usbatm_instance;
instance->modem_type = (struct cxacru_modem_type *) id->driver_info;

Index: Linux/drivers/usb/atm/speedtch.c
===================================================================
--- Linux.orig/drivers/usb/atm/speedtch.c 2006-01-13 08:48:09.000000000 +0100
+++ Linux/drivers/usb/atm/speedtch.c 2006-01-13 08:51:00.000000000 +0100
@@ -715,7 +715,7 @@
}
}

- instance = kmalloc(sizeof(*instance), GFP_KERNEL);
+ instance = kzalloc(sizeof(*instance), GFP_KERNEL);

if (!instance) {
usb_err(usbatm, "%s: no memory for instance data!\n", __func__);
@@ -723,8 +723,6 @@
goto fail_release;
}

- memset(instance, 0, sizeof(struct speedtch_instance_data));
-
instance->usbatm = usbatm;

INIT_WORK(&instance->status_checker, (void *)speedtch_check_status, instance);
Index: Linux/drivers/usb/atm/usbatm.c
===================================================================
--- Linux.orig/drivers/usb/atm/usbatm.c 2006-01-13 08:46:17.000000000 +0100
+++ Linux/drivers/usb/atm/usbatm.c 2006-01-13 08:51:00.000000000 +0100
@@ -763,13 +763,12 @@
goto fail;
}

- if (!(new = kmalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
+ if (!(new = kzalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
atm_err(instance, "%s: no memory for vcc_data!\n", __func__);
ret = -ENOMEM;
goto fail;
}

- memset(new, 0, sizeof(struct usbatm_vcc_data));
new->vcc = vcc;
new->vpi = vpi;
new->vci = vci;
@@ -1066,13 +1065,12 @@

instance->urbs[i] = urb;

- buffer = kmalloc(channel->buf_size, GFP_KERNEL);
+ /* zero the tx padding to avoid leaking information */
+ buffer = kzalloc(channel->buf_size, GFP_KERNEL);
if (!buffer) {
dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i);
goto fail_unbind;
}
- /* zero the tx padding to avoid leaking information */
- memset(buffer, 0, channel->buf_size);

usb_fill_bulk_urb(urb, instance->usb_dev, channel->endpoint,
buffer, channel->buf_size, usbatm_complete, channel);
\
 
 \ /
  Last update: 2006-01-13 09:40    [from the cache]
©2003-2011 Jasper Spaans