[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()
All kcalloc() calls of the form "kcalloc(1,...)" are converted to the equivalent kzalloc() calls, and a few kcalloc() calls with the incorrect ordering of the first two arguments are fixed. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Adam Belay <ambx1@neo.rr.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Greg KH <greg@kroah.com> Cc: Mark Fasheh <mark.fasheh@oracle.com> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
90aef12e6d
commit
cd86128088
@ -139,7 +139,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||
return 0;
|
||||
|
||||
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
|
||||
dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
|
||||
dev = kzalloc(sizeof(struct pnp_dev), GFP_KERNEL);
|
||||
if (!dev) {
|
||||
pnp_err("Out of memory");
|
||||
return -ENOMEM;
|
||||
@ -169,7 +169,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||
dev->number = num;
|
||||
|
||||
/* set the initial values for the PnP device */
|
||||
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
||||
dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||
if (!dev_id)
|
||||
goto err;
|
||||
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
|
||||
@ -201,7 +201,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
|
||||
for (i = 0; i < cid_list->count; i++) {
|
||||
if (!ispnpidacpi(cid_list->id[i].value))
|
||||
continue;
|
||||
dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
|
||||
dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
|
||||
if (!dev_id)
|
||||
continue;
|
||||
|
||||
|
Reference in New Issue
Block a user