Commit 48e3eeb1 authored by Mariusz Kozlowski's avatar Mariusz Kozlowski Committed by David S. Miller

[IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc

 drivers/net/irda/irda-usb.c | 59694 -> 59541 (-153 bytes)
 drivers/net/irda/irda-usb.o | 170588 -> 169256 (-1332 bytes)
Signed-off-by: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ee32543
...@@ -1561,10 +1561,9 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf ...@@ -1561,10 +1561,9 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf
struct irda_class_desc *desc; struct irda_class_desc *desc;
int ret; int ret;
desc = kmalloc(sizeof (*desc), GFP_KERNEL); desc = kzalloc(sizeof(*desc), GFP_KERNEL);
if (desc == NULL) if (!desc)
return NULL; return NULL;
memset(desc, 0, sizeof(*desc));
/* USB-IrDA class spec 1.0: /* USB-IrDA class spec 1.0:
* 6.1.3: Standard "Get Descriptor" Device Request is not * 6.1.3: Standard "Get Descriptor" Device Request is not
...@@ -1617,7 +1616,7 @@ static int irda_usb_probe(struct usb_interface *intf, ...@@ -1617,7 +1616,7 @@ static int irda_usb_probe(struct usb_interface *intf,
{ {
struct net_device *net; struct net_device *net;
struct usb_device *dev = interface_to_usbdev(intf); struct usb_device *dev = interface_to_usbdev(intf);
struct irda_usb_cb *self = NULL; struct irda_usb_cb *self;
struct usb_host_interface *interface; struct usb_host_interface *interface;
struct irda_class_desc *irda_desc; struct irda_class_desc *irda_desc;
int ret = -ENOMEM; int ret = -ENOMEM;
...@@ -1655,7 +1654,7 @@ static int irda_usb_probe(struct usb_interface *intf, ...@@ -1655,7 +1654,7 @@ static int irda_usb_probe(struct usb_interface *intf,
self->header_length = USB_IRDA_HEADER; self->header_length = USB_IRDA_HEADER;
} }
self->rx_urb = kzalloc(self->max_rx_urb * sizeof(struct urb *), self->rx_urb = kcalloc(self->max_rx_urb, sizeof(struct urb *),
GFP_KERNEL); GFP_KERNEL);
for (i = 0; i < self->max_rx_urb; i++) { for (i = 0; i < self->max_rx_urb; i++) {
...@@ -1715,7 +1714,7 @@ static int irda_usb_probe(struct usb_interface *intf, ...@@ -1715,7 +1714,7 @@ static int irda_usb_probe(struct usb_interface *intf,
/* Find IrDA class descriptor */ /* Find IrDA class descriptor */
irda_desc = irda_usb_find_class_desc(intf); irda_desc = irda_usb_find_class_desc(intf);
ret = -ENODEV; ret = -ENODEV;
if (irda_desc == NULL) if (!irda_desc)
goto err_out_3; goto err_out_3;
if (self->needspatch) { if (self->needspatch) {
...@@ -1738,15 +1737,13 @@ static int irda_usb_probe(struct usb_interface *intf, ...@@ -1738,15 +1737,13 @@ static int irda_usb_probe(struct usb_interface *intf,
/* Don't change this buffer size and allocation without doing /* Don't change this buffer size and allocation without doing
* some heavy and complete testing. Don't ask why :-( * some heavy and complete testing. Don't ask why :-(
* Jean II */ * Jean II */
self->speed_buff = kmalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL); self->speed_buff = kzalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
if (self->speed_buff == NULL) if (!self->speed_buff)
goto err_out_3; goto err_out_3;
memset(self->speed_buff, 0, IRDA_USB_SPEED_MTU);
self->tx_buff = kzalloc(IRDA_SKB_MAX_MTU + self->header_length, self->tx_buff = kzalloc(IRDA_SKB_MAX_MTU + self->header_length,
GFP_KERNEL); GFP_KERNEL);
if (self->tx_buff == NULL) if (!self->tx_buff)
goto err_out_4; goto err_out_4;
ret = irda_usb_open(self); ret = irda_usb_open(self);
...@@ -1767,12 +1764,11 @@ static int irda_usb_probe(struct usb_interface *intf, ...@@ -1767,12 +1764,11 @@ static int irda_usb_probe(struct usb_interface *intf,
/* replace IrDA class descriptor with what patched device is now reporting */ /* replace IrDA class descriptor with what patched device is now reporting */
irda_desc = irda_usb_find_class_desc (self->usbintf); irda_desc = irda_usb_find_class_desc (self->usbintf);
if (irda_desc == NULL) { if (!irda_desc) {
ret = -ENODEV; ret = -ENODEV;
goto err_out_6; goto err_out_6;
} }
if (self->irda_desc) kfree(self->irda_desc);
kfree (self->irda_desc);
self->irda_desc = irda_desc; self->irda_desc = irda_desc;
irda_usb_init_qos(self); irda_usb_init_qos(self);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment