diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-11-22 13:54:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-01 17:25:51 -0500 |
commit | 7ac9da10af7ffd94cfd07e097b93d588bbd32b75 (patch) | |
tree | 335f931bb41e09ed9fff8c6bc4942f564c6a9ef3 /drivers | |
parent | afd21ee5abd0fef567dbfa234099304886ff83ce (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ark3116.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/console.c | 6 | ||||
-rw-r--r-- | drivers/usb/serial/garmin_gps.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/mos7840.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index ca52f12f0e24..863966c1c5ac 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
@@ -85,10 +85,9 @@ static int ark3116_attach(struct usb_serial *serial) | |||
85 | int i; | 85 | int i; |
86 | 86 | ||
87 | for (i = 0; i < serial->num_ports; ++i) { | 87 | for (i = 0; i < serial->num_ports; ++i) { |
88 | priv = kmalloc(sizeof (struct ark3116_private), GFP_KERNEL); | 88 | priv = kzalloc(sizeof(struct ark3116_private), GFP_KERNEL); |
89 | if (!priv) | 89 | if (!priv) |
90 | goto cleanup; | 90 | goto cleanup; |
91 | memset(priv, 0x00, sizeof (struct ark3116_private)); | ||
92 | spin_lock_init(&priv->lock); | 91 | spin_lock_init(&priv->lock); |
93 | 92 | ||
94 | usb_set_serial_port_data(serial->port[i], priv); | 93 | usb_set_serial_port_data(serial->port[i], priv); |
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index 3a9073dbfe6a..7167728d764c 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
@@ -166,19 +166,17 @@ static int usb_console_setup(struct console *co, char *options) | |||
166 | if (serial->type->set_termios) { | 166 | if (serial->type->set_termios) { |
167 | /* build up a fake tty structure so that the open call has something | 167 | /* build up a fake tty structure so that the open call has something |
168 | * to look at to get the cflag value */ | 168 | * to look at to get the cflag value */ |
169 | tty = kmalloc (sizeof (*tty), GFP_KERNEL); | 169 | tty = kzalloc(sizeof(*tty), GFP_KERNEL); |
170 | if (!tty) { | 170 | if (!tty) { |
171 | err ("no more memory"); | 171 | err ("no more memory"); |
172 | return -ENOMEM; | 172 | return -ENOMEM; |
173 | } | 173 | } |
174 | termios = kmalloc (sizeof (*termios), GFP_KERNEL); | 174 | termios = kzalloc(sizeof(*termios), GFP_KERNEL); |
175 | if (!termios) { | 175 | if (!termios) { |
176 | err ("no more memory"); | 176 | err ("no more memory"); |
177 | kfree (tty); | 177 | kfree (tty); |
178 | return -ENOMEM; | 178 | return -ENOMEM; |
179 | } | 179 | } |
180 | memset (tty, 0x00, sizeof(*tty)); | ||
181 | memset (termios, 0x00, sizeof(*termios)); | ||
182 | termios->c_cflag = cflag; | 180 | termios->c_cflag = cflag; |
183 | tty->termios = termios; | 181 | tty->termios = termios; |
184 | port->tty = tty; | 182 | port->tty = tty; |
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 4543152a9966..6530d391ebed 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
@@ -1523,12 +1523,11 @@ static int garmin_attach (struct usb_serial *serial) | |||
1523 | 1523 | ||
1524 | dbg("%s", __FUNCTION__); | 1524 | dbg("%s", __FUNCTION__); |
1525 | 1525 | ||
1526 | garmin_data_p = kmalloc (sizeof(struct garmin_data), GFP_KERNEL); | 1526 | garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL); |
1527 | if (garmin_data_p == NULL) { | 1527 | if (garmin_data_p == NULL) { |
1528 | dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__); | 1528 | dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__); |
1529 | return -ENOMEM; | 1529 | return -ENOMEM; |
1530 | } | 1530 | } |
1531 | memset (garmin_data_p, 0, sizeof(struct garmin_data)); | ||
1532 | init_timer(&garmin_data_p->timer); | 1531 | init_timer(&garmin_data_p->timer); |
1533 | spin_lock_init(&garmin_data_p->lock); | 1532 | spin_lock_init(&garmin_data_p->lock); |
1534 | INIT_LIST_HEAD(&garmin_data_p->pktlist); | 1533 | INIT_LIST_HEAD(&garmin_data_p->pktlist); |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 5b71962d0351..02c89e10b2cf 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -2596,12 +2596,11 @@ static int mos7840_startup(struct usb_serial *serial) | |||
2596 | 2596 | ||
2597 | /* set up port private structures */ | 2597 | /* set up port private structures */ |
2598 | for (i = 0; i < serial->num_ports; ++i) { | 2598 | for (i = 0; i < serial->num_ports; ++i) { |
2599 | mos7840_port = kmalloc(sizeof(struct moschip_port), GFP_KERNEL); | 2599 | mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL); |
2600 | if (mos7840_port == NULL) { | 2600 | if (mos7840_port == NULL) { |
2601 | err("%s - Out of memory", __FUNCTION__); | 2601 | err("%s - Out of memory", __FUNCTION__); |
2602 | return -ENOMEM; | 2602 | return -ENOMEM; |
2603 | } | 2603 | } |
2604 | memset(mos7840_port, 0, sizeof(struct moschip_port)); | ||
2605 | 2604 | ||
2606 | /* Initialize all port interrupt end point to port 0 int endpoint * | 2605 | /* Initialize all port interrupt end point to port 0 int endpoint * |
2607 | * Our device has only one interrupt end point comman to all port */ | 2606 | * Our device has only one interrupt end point comman to all port */ |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index bbbb993447b9..ae98d8cbdbb8 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -461,13 +461,12 @@ static int ti_startup(struct usb_serial *serial) | |||
461 | 461 | ||
462 | /* set up port structures */ | 462 | /* set up port structures */ |
463 | for (i = 0; i < serial->num_ports; ++i) { | 463 | for (i = 0; i < serial->num_ports; ++i) { |
464 | tport = kmalloc(sizeof(struct ti_port), GFP_KERNEL); | 464 | tport = kzalloc(sizeof(struct ti_port), GFP_KERNEL); |
465 | if (tport == NULL) { | 465 | if (tport == NULL) { |
466 | dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__); | 466 | dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__); |
467 | status = -ENOMEM; | 467 | status = -ENOMEM; |
468 | goto free_tports; | 468 | goto free_tports; |
469 | } | 469 | } |
470 | memset(tport, 0, sizeof(struct ti_port)); | ||
471 | spin_lock_init(&tport->tp_lock); | 470 | spin_lock_init(&tport->tp_lock); |
472 | tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); | 471 | tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR); |
473 | tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0; | 472 | tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0; |