diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-06 15:18:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:46 -0700 |
| commit | 7b842b6e3704f4b9606ff8a4ffe03579d9addf5e (patch) | |
| tree | 96623714a4c80ba5270031f9b38de773d691ec3e /drivers/usb/input | |
| parent | a97e148a8b8da8b04bc3e18ceb824a8f5f56d567 (diff) | |
[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>
Diffstat (limited to 'drivers/usb/input')
| -rw-r--r-- | drivers/usb/input/acecad.c | 2 | ||||
| -rw-r--r-- | drivers/usb/input/itmtouch.c | 2 | ||||
| -rw-r--r-- | drivers/usb/input/pid.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c index 13532f3e3ef..74f8760d7c0 100644 --- a/drivers/usb/input/acecad.c +++ b/drivers/usb/input/acecad.c @@ -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; diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c index 0dc439f1082..becb87efb86 100644 --- a/drivers/usb/input/itmtouch.c +++ b/drivers/usb/input/itmtouch.c @@ -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; } diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c index 25696386347..acc71ec560e 100644 --- a/drivers/usb/input/pid.c +++ b/drivers/usb/input/pid.c @@ -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; |