This patch converts code that uses kmalloc() and memset() to get a zeroed
memory block to use kcalloc() instead in serial and storage directories of
drivers/usb/.
Rediffed against 2.6.10-rc1-bk1.
Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
---
serial/console.c | 6 ++----
serial/ftdi_sio.c | 3 +--
serial/io_edgeport.c | 6 ++----
serial/ir-usb.c | 3 +--
serial/keyspan.c | 10 ++++------
serial/kobil_sct.c | 13 ++++---------
serial/pl2303.c | 6 ++----
serial/usb-serial.c | 6 ++----
storage/datafab.c | 3 +--
storage/isd200.c | 13 ++++---------
storage/jumpshot.c | 3 +--
storage/sddr09.c | 3 +--
storage/sddr55.c | 5 ++---
storage/usb.c | 3 +--
usb-skeleton.c | 3 +--
15 files changed, 29 insertions(+), 57 deletions(-)
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/console.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/console.c 2004-10-23
22:07:59.090928416 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/console.c 2004-10-23 22:13:34.345961904
+0300
@@ -168,19 +168,17 @@
if (serial->type->set_termios) {
/* build up a fake tty structure so that the open call has something
* to look at to get the cflag value */
- tty = kmalloc (sizeof (*tty), GFP_KERNEL);
+ tty = kcalloc (1, sizeof (*tty), GFP_KERNEL);
if (!tty) {
err ("no more memory");
return -ENOMEM;
}
- termios = kmalloc (sizeof (*termios), GFP_KERNEL);
+ termios = kcalloc (1, sizeof (*termios), GFP_KERNEL);
if (!termios) {
err ("no more memory");
kfree (tty);
return -ENOMEM;
}
- memset (tty, 0x00, sizeof(*tty));
- memset (termios, 0x00, sizeof(*termios));
termios->c_cflag = cflag;
tty->termios = termios;
port->tty = tty;
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/ftdi_sio.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/ftdi_sio.c 2004-10-23
22:07:59.139920968 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/ftdi_sio.c 2004-10-23 22:13:34.348961448
+0300
@@ -1188,12 +1188,11 @@
dbg("%s",__FUNCTION__);
- priv = kmalloc(sizeof(struct ftdi_private), GFP_KERNEL);
+ priv = kcalloc(1, sizeof(*priv), GFP_KERNEL);
if (!priv){
err("%s- kmalloc(%Zd) failed.", __FUNCTION__, sizeof(struct
ftdi_private));
return -ENOMEM;
}
- memset(priv, 0, sizeof(*priv));
spin_lock_init(&priv->rx_lock);
init_waitqueue_head(&priv->delta_msr_wait);
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/io_edgeport.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/io_edgeport.c 2004-10-23
22:07:59.187913672 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/io_edgeport.c 2004-10-23 22:13:34.351960992
+0300
@@ -2892,12 +2892,11 @@
dev = serial->dev;
/* create our private serial structure */
- edge_serial = kmalloc (sizeof(struct edgeport_serial), GFP_KERNEL);
+ edge_serial = kcalloc (1, sizeof(*edge_serial), GFP_KERNEL);
if (edge_serial == NULL) {
dev_err(&serial->dev->dev, "%s - Out of memory", __FUNCTION__);
return -ENOMEM;
}
- memset (edge_serial, 0, sizeof(struct edgeport_serial));
edge_serial->serial = serial;
usb_set_serial_data(serial, edge_serial);
@@ -2948,14 +2947,13 @@
/* set up our port private structures */
for (i = 0; i < serial->num_ports; ++i) {
- edge_port = kmalloc (sizeof(struct edgeport_port), GFP_KERNEL);
+ edge_port = kcalloc (1, sizeof(*edge_port), GFP_KERNEL);
if (edge_port == NULL) {
dev_err(&serial->dev->dev, "%s - Out of memory", __FUNCTION__);
usb_set_serial_data(serial, NULL);
kfree(edge_serial);
return -ENOMEM;
}
- memset (edge_port, 0, sizeof(struct edgeport_port));
edge_port->port = serial->port[i];
usb_set_serial_port_data(serial->port[i], edge_port);
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/ir-usb.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/ir-usb.c 2004-10-23 22:07:59.220908656
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/ir-usb.c 2004-10-23 22:13:34.352960840
+0300
@@ -181,10 +181,9 @@
struct irda_class_desc *desc;
int ret;
- desc = kmalloc(sizeof (struct irda_class_desc), GFP_KERNEL);
+ desc = kcalloc(1, sizeof (*desc), GFP_KERNEL);
if (desc == NULL)
return NULL;
- memset(desc, 0, sizeof(struct irda_class_desc));
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev,0),
IU_REQ_GET_CLASS_DESC,
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/keyspan.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/keyspan.c 2004-10-23
22:07:59.222908352 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/keyspan.c 2004-10-23 22:13:34.355960384
+0300
@@ -2256,12 +2256,11 @@
}
/* Setup private data for serial driver */
- s_priv = kmalloc(sizeof(struct keyspan_serial_private), GFP_KERNEL);
+ s_priv = kcalloc(1, sizeof(*s_priv), GFP_KERNEL);
if (!s_priv) {
- dbg("%s - kmalloc for keyspan_serial_private failed.", __FUNCTION__);
+ dbg("%s - kcalloc for keyspan_serial_private failed.", __FUNCTION__);
return -ENOMEM;
}
- memset(s_priv, 0, sizeof(struct keyspan_serial_private));
s_priv->device_details = d_details;
usb_set_serial_data(serial, s_priv);
@@ -2269,12 +2268,11 @@
/* Now setup per port private data */
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
- p_priv = kmalloc(sizeof(struct keyspan_port_private), GFP_KERNEL);
+ p_priv = kcalloc(1, sizeof(*p_priv), GFP_KERNEL);
if (!p_priv) {
- dbg("%s - kmalloc for keyspan_port_private (%d) failed!.",
__FUNCTION__, i);
+ dbg("%s - kcalloc for keyspan_port_private (%d) failed!.",
__FUNCTION__, i);
return (1);
}
- memset(p_priv, 0, sizeof(struct keyspan_port_private));
p_priv->device_details = d_details;
usb_set_serial_port_data(port, p_priv);
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/kobil_sct.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/kobil_sct.c 2004-10-23
22:07:59.262902272 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/kobil_sct.c 2004-10-23 22:13:34.356960232
+0300
@@ -252,11 +252,9 @@
}
// allocate memory for transfer buffer
- transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length,
GFP_KERNEL);
+ transfer_buffer = kcalloc(1, transfer_buffer_length, GFP_KERNEL);
if (! transfer_buffer) {
return -ENOMEM;
- } else {
- memset(transfer_buffer, 0, transfer_buffer_length);
}
// allocate write_urb
@@ -522,11 +520,10 @@
}
// allocate memory for transfer buffer
- transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length,
GFP_KERNEL);
+ transfer_buffer = kcalloc(1, transfer_buffer_length, GFP_KERNEL);
if (!transfer_buffer) {
return -ENOMEM;
}
- memset(transfer_buffer, 0, transfer_buffer_length);
result = usb_control_msg( port->serial->dev,
usb_rcvctrlpipe(port->serial->dev, 0 ),
@@ -568,11 +565,10 @@
}
// allocate memory for transfer buffer
- transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length,
GFP_KERNEL);
+ transfer_buffer = kcalloc(1, transfer_buffer_length, GFP_KERNEL);
if (! transfer_buffer) {
return -ENOMEM;
}
- memset(transfer_buffer, 0, transfer_buffer_length);
if (set & TIOCM_RTS)
rts = 1;
@@ -661,11 +657,10 @@
(struct termios __user *)arg))
return -EFAULT;
- settings = (unsigned char *) kmalloc(50, GFP_KERNEL);
+ settings = kcalloc(1, 50, GFP_KERNEL);
if (! settings) {
return -ENOBUFS;
}
- memset(settings, 0, 50);
switch (priv->internal_termios.c_cflag & CBAUD) {
case B1200:
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/pl2303.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/pl2303.c 2004-10-23 22:08:17.897069448
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/pl2303.c 2004-10-23 22:13:58.766249456
+0300
@@ -230,10 +230,9 @@
dbg("device type: %d", type);
for (i = 0; i < serial->num_ports; ++i) {
- priv = kmalloc (sizeof (struct pl2303_private), GFP_KERNEL);
+ priv = kcalloc (1, sizeof (*priv), GFP_KERNEL);
if (!priv)
goto cleanup;
- memset (priv, 0x00, sizeof (struct pl2303_private));
spin_lock_init(&priv->lock);
priv->buf = pl2303_buf_alloc(PL2303_BUF_SIZE);
if (priv->buf == NULL) {
@@ -395,12 +394,11 @@
}
}
- buf = kmalloc (7, GFP_KERNEL);
+ buf = kcalloc (1, 7, GFP_KERNEL);
if (!buf) {
dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
return;
}
- memset (buf, 0x00, 0x07);
i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
Index: 2.6.10-rc1-bk1-usb/drivers/usb/serial/usb-serial.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/serial/usb-serial.c 2004-10-23
22:08:17.939063064 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/serial/usb-serial.c 2004-10-23 22:13:34.360959624
+0300
@@ -811,12 +811,11 @@
{
struct usb_serial *serial;
- serial = kmalloc (sizeof (*serial), GFP_KERNEL);
+ serial = kcalloc (1, sizeof (*serial), GFP_KERNEL);
if (!serial) {
dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__);
return NULL;
}
- memset (serial, 0, sizeof(*serial));
serial->dev = usb_get_dev(dev);
serial->type = type;
serial->interface = interface;
@@ -1015,10 +1014,9 @@
serial->num_port_pointers = max_endpoints;
dbg("%s - setting up %d port structures for this device", __FUNCTION__,
max_endpoints);
for (i = 0; i < max_endpoints; ++i) {
- port = kmalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
+ port = kcalloc(1, sizeof(*port), GFP_KERNEL);
if (!port)
goto probe_error;
- memset(port, 0x00, sizeof(struct usb_serial_port));
port->number = i + serial->minor;
port->serial = serial;
INIT_WORK(&port->work, usb_serial_port_softint, port);
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/datafab.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/datafab.c 2004-10-23
22:06:57.055359256 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/datafab.c 2004-10-23 22:13:34.361959472
+0300
@@ -512,13 +512,12 @@
};
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct datafab_info), GFP_NOIO);
+ us->extra = kcalloc(1, sizeof(struct datafab_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("datafab_transport: Gah! "
"Can't allocate storage for Datafab info struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
- memset(us->extra, 0, sizeof(struct datafab_info));
us->extra_destructor = datafab_info_destructor;
((struct datafab_info *)us->extra)->lun = -1;
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/isd200.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/isd200.c 2004-10-23
22:07:59.342890112 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/isd200.c 2004-10-23 22:13:34.363959168
+0300
@@ -1360,22 +1360,17 @@
int retStatus = ISD200_GOOD;
struct isd200_info *info;
- info = (struct isd200_info *)
- kmalloc(sizeof(struct isd200_info), GFP_KERNEL);
+ info = kcalloc(1, sizeof(*info), GFP_KERNEL);
if (!info)
retStatus = ISD200_ERROR;
else {
- memset(info, 0, sizeof(struct isd200_info));
- info->id = (struct hd_driveid *)
- kmalloc(sizeof(struct hd_driveid), GFP_KERNEL);
- info->RegsBuf = (unsigned char *)
- kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
+ info->id = kcalloc(1, sizeof(*info->id), GFP_KERNEL);
+ info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
if (!info->id || !info->RegsBuf) {
isd200_free_info_ptrs(info);
kfree(info);
retStatus = ISD200_ERROR;
- } else
- memset(info->id, 0, sizeof(struct hd_driveid));
+ }
}
if (retStatus == ISD200_GOOD) {
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/jumpshot.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/jumpshot.c 2004-10-23
22:06:57.058358800 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/jumpshot.c 2004-10-23 22:13:34.364959016
+0300
@@ -441,12 +441,11 @@
};
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct jumpshot_info), GFP_NOIO);
+ us->extra = kcalloc(1, sizeof(struct jumpshot_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("jumpshot_transport: Gah! Can't allocate storage
for jumpshot info struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
- memset(us->extra, 0, sizeof(struct jumpshot_info));
us->extra_destructor = jumpshot_info_destructor;
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/sddr09.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/sddr09.c 2004-10-23
22:06:57.060358496 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/sddr09.c 2004-10-23 22:13:34.365958864
+0300
@@ -1345,9 +1345,8 @@
static void
sddr09_init_card_info(struct us_data *us) {
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct sddr09_card_info), GFP_NOIO);
+ us->extra = kcalloc(1, sizeof(struct sddr09_card_info), GFP_NOIO);
if (us->extra) {
- memset(us->extra, 0, sizeof(struct sddr09_card_info));
us->extra_destructor = sddr09_card_info_destructor;
}
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/sddr55.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/sddr55.c 2004-10-23
22:06:57.061358344 +0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/sddr55.c 2004-10-23 22:13:34.366958712
+0300
@@ -759,11 +759,10 @@
struct sddr55_card_info *info;
if (!us->extra) {
- us->extra = kmalloc(
- sizeof(struct sddr55_card_info), GFP_NOIO);
+ us->extra = kcalloc(
+ 1, sizeof(struct sddr55_card_info), GFP_NOIO);
if (!us->extra)
return USB_STOR_TRANSPORT_ERROR;
- memset(us->extra, 0, sizeof(struct sddr55_card_info));
us->extra_destructor = sddr55_card_info_destructor;
}
Index: 2.6.10-rc1-bk1-usb/drivers/usb/storage/usb.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/storage/usb.c 2004-10-23 22:07:59.427877192
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/storage/usb.c 2004-10-23 22:13:34.368958408
+0300
@@ -934,12 +934,11 @@
US_DEBUGP("USB Mass Storage device detected\n");
/* Allocate the us_data structure and initialize the mutexes */
- us = (struct us_data *) kmalloc(sizeof(*us), GFP_KERNEL);
+ us = kcalloc(1, sizeof(*us), GFP_KERNEL);
if (!us) {
printk(KERN_WARNING USB_STORAGE "Out of memory\n");
return -ENOMEM;
}
- memset(us, 0, sizeof(struct us_data));
init_MUTEX(&(us->dev_semaphore));
init_MUTEX_LOCKED(&(us->sema));
init_completion(&(us->notify));
Index: 2.6.10-rc1-bk1-usb/drivers/usb/usb-skeleton.c
===================================================================
--- 2.6.10-rc1-bk1-usb.orig/drivers/usb/usb-skeleton.c 2004-10-23 22:06:57.063358040
+0300
+++ 2.6.10-rc1-bk1-usb/drivers/usb/usb-skeleton.c 2004-10-23 22:13:34.369958256
+0300
@@ -238,12 +238,11 @@
int retval = -ENOMEM;
/* allocate memory for our device state and initialize it */
- dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+ dev = kcalloc(1, sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
err("Out of memory");
goto error;
}
- memset(dev, 0x00, sizeof(*dev));
kref_init(&dev->kref);
dev->udev = usb_get_dev(interface_to_usbdev(interface));
-------------------------------------------------------
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
