mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
USB serial: replace kmalloc+memset with kzalloc
Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman <yan_952@hotmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
afd21ee5ab
commit
7ac9da10af
5 changed files with 6 additions and 12 deletions
|
@ -85,10 +85,9 @@ static int ark3116_attach(struct usb_serial *serial)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < serial->num_ports; ++i) {
|
||||
priv = kmalloc(sizeof (struct ark3116_private), GFP_KERNEL);
|
||||
priv = kzalloc(sizeof(struct ark3116_private), GFP_KERNEL);
|
||||
if (!priv)
|
||||
goto cleanup;
|
||||
memset(priv, 0x00, sizeof (struct ark3116_private));
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
usb_set_serial_port_data(serial->port[i], priv);
|
||||
|
|
|
@ -166,19 +166,17 @@ static int usb_console_setup(struct console *co, char *options)
|
|||
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 = kzalloc(sizeof(*tty), GFP_KERNEL);
|
||||
if (!tty) {
|
||||
err ("no more memory");
|
||||
return -ENOMEM;
|
||||
}
|
||||
termios = kmalloc (sizeof (*termios), GFP_KERNEL);
|
||||
termios = kzalloc(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;
|
||||
|
|
|
@ -1523,12 +1523,11 @@ static int garmin_attach (struct usb_serial *serial)
|
|||
|
||||
dbg("%s", __FUNCTION__);
|
||||
|
||||
garmin_data_p = kmalloc (sizeof(struct garmin_data), GFP_KERNEL);
|
||||
garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL);
|
||||
if (garmin_data_p == NULL) {
|
||||
dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset (garmin_data_p, 0, sizeof(struct garmin_data));
|
||||
init_timer(&garmin_data_p->timer);
|
||||
spin_lock_init(&garmin_data_p->lock);
|
||||
INIT_LIST_HEAD(&garmin_data_p->pktlist);
|
||||
|
|
|
@ -2596,12 +2596,11 @@ static int mos7840_startup(struct usb_serial *serial)
|
|||
|
||||
/* set up port private structures */
|
||||
for (i = 0; i < serial->num_ports; ++i) {
|
||||
mos7840_port = kmalloc(sizeof(struct moschip_port), GFP_KERNEL);
|
||||
mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);
|
||||
if (mos7840_port == NULL) {
|
||||
err("%s - Out of memory", __FUNCTION__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(mos7840_port, 0, sizeof(struct moschip_port));
|
||||
|
||||
/* Initialize all port interrupt end point to port 0 int endpoint *
|
||||
* Our device has only one interrupt end point comman to all port */
|
||||
|
|
|
@ -461,13 +461,12 @@ static int ti_startup(struct usb_serial *serial)
|
|||
|
||||
/* set up port structures */
|
||||
for (i = 0; i < serial->num_ports; ++i) {
|
||||
tport = kmalloc(sizeof(struct ti_port), GFP_KERNEL);
|
||||
tport = kzalloc(sizeof(struct ti_port), GFP_KERNEL);
|
||||
if (tport == NULL) {
|
||||
dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__);
|
||||
status = -ENOMEM;
|
||||
goto free_tports;
|
||||
}
|
||||
memset(tport, 0, sizeof(struct ti_port));
|
||||
spin_lock_init(&tport->tp_lock);
|
||||
tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR);
|
||||
tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0;
|
||||
|
|
Loading…
Reference in a new issue