]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
USB: io_edgeport: Use kzalloc
authorJulia Lawall <julia@diku.dk>
Thu, 13 May 2010 20:00:40 +0000 (22:00 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:46 +0000 (13:21 -0700)
Use kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/io_edgeport.c

index 3ef8df0ef888e9d99849953d275dfe81a6f6b47b..76e6fb3aab7a475c0c64f708298be4c9b03b36a0 100644 (file)
@@ -3020,7 +3020,7 @@ static int edge_startup(struct usb_serial *serial)
 
        /* 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 = kzalloc(sizeof(struct edgeport_port), GFP_KERNEL);
                if (edge_port == NULL) {
                        dev_err(&serial->dev->dev, "%s - Out of memory\n",
                                                                   __func__);
@@ -3033,7 +3033,6 @@ static int edge_startup(struct usb_serial *serial)
                        kfree(edge_serial);
                        return -ENOMEM;
                }
-               memset(edge_port, 0, sizeof(struct edgeport_port));
                spin_lock_init(&edge_port->ep_lock);
                edge_port->port = serial->port[i];
                usb_set_serial_port_data(serial->port[i], edge_port);