[PATCH] USB: convert kcalloc to kzalloc
This patch converts kcalloc(1, ...) calls to use the new kzalloc() function. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
a97e148a8b
commit
7b842b6e37
|
@ -960,7 +960,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
|
|||
intf->altsetting->desc.bInterfaceNumber);
|
||||
|
||||
/* instance init */
|
||||
instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
|
||||
instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
|
||||
if (!instance) {
|
||||
dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
|
||||
return -ENOMEM;
|
||||
|
|
|
@ -1669,7 +1669,7 @@ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
|
|||
{
|
||||
struct usb_hcd *hcd;
|
||||
|
||||
hcd = kcalloc(1, sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
|
||||
hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
|
||||
if (!hcd) {
|
||||
dev_dbg (dev, "hcd alloc failed\n");
|
||||
return NULL;
|
||||
|
|
|
@ -638,7 +638,7 @@ iso_stream_alloc (unsigned mem_flags)
|
|||
{
|
||||
struct ehci_iso_stream *stream;
|
||||
|
||||
stream = kcalloc(1, sizeof *stream, mem_flags);
|
||||
stream = kzalloc(sizeof *stream, mem_flags);
|
||||
if (likely (stream != NULL)) {
|
||||
INIT_LIST_HEAD(&stream->td_list);
|
||||
INIT_LIST_HEAD(&stream->free_list);
|
||||
|
|
|
@ -717,7 +717,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
|
|||
}
|
||||
/* avoid all allocations within spinlocks: request or endpoint */
|
||||
if (!hep->hcpriv) {
|
||||
ep = kcalloc(1, sizeof *ep, mem_flags);
|
||||
ep = kzalloc(sizeof *ep, mem_flags);
|
||||
if (!ep)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
|
|
@ -835,7 +835,7 @@ static int sl811h_urb_enqueue(
|
|||
|
||||
/* avoid all allocations within spinlocks */
|
||||
if (!hep->hcpriv)
|
||||
ep = kcalloc(1, sizeof *ep, mem_flags);
|
||||
ep = kzalloc(sizeof *ep, mem_flags);
|
||||
|
||||
spin_lock_irqsave(&sl811->lock, flags);
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
|
|||
pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
|
||||
maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
|
||||
|
||||
acecad = kcalloc(1, sizeof(struct usb_acecad), GFP_KERNEL);
|
||||
acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);
|
||||
if (!acecad)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id
|
|||
interface = intf->cur_altsetting;
|
||||
endpoint = &interface->endpoint[0].desc;
|
||||
|
||||
if (!(itmtouch = kcalloc(1, sizeof(struct itmtouch_dev), GFP_KERNEL))) {
|
||||
if (!(itmtouch = kzalloc(sizeof(struct itmtouch_dev), GFP_KERNEL))) {
|
||||
err("%s - Out of memory.", __FUNCTION__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
|
|
@ -263,7 +263,7 @@ int hid_pid_init(struct hid_device *hid)
|
|||
struct hid_ff_pid *private;
|
||||
struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list);
|
||||
|
||||
private = hid->ff_private = kcalloc(1, sizeof(struct hid_ff_pid), GFP_KERNEL);
|
||||
private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL);
|
||||
if (!private)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
Loading…
Reference in a new issue