mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
some kmalloc/memset ->kzalloc (tree wide)
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [[email protected]: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Acked-by: Russell King <[email protected]> Cc: Bryan Wu <[email protected]> Acked-by: Jiri Slaby <[email protected]> Cc: Dave Airlie <[email protected]> Acked-by: Roland Dreier <[email protected]> Cc: Jiri Kosina <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Pierre Ossman <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: "David S. Miller" <[email protected]> Acked-by: Greg KH <[email protected]> Cc: James Bottomley <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
3b5ad0797c
commit
dd00cc486a
136 changed files with 157 additions and 330 deletions
|
|
@ -979,10 +979,9 @@ static int asus_hotk_add(struct acpi_device *device)
|
|||
printk(ASUS_NOTICE "Asus Laptop Support version %s\n",
|
||||
ASUS_LAPTOP_VERSION);
|
||||
|
||||
hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
|
||||
hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
|
||||
if (!hotk)
|
||||
return -ENOMEM;
|
||||
memset(hotk, 0, sizeof(struct asus_hotk));
|
||||
|
||||
hotk->handle = device->handle;
|
||||
strcpy(acpi_device_name(device), ASUS_HOTK_DEVICE_NAME);
|
||||
|
|
|
|||
|
|
@ -41,18 +41,16 @@ struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_s
|
|||
if (buffer_size > IBMASM_CMD_MAX_BUFFER_SIZE)
|
||||
return NULL;
|
||||
|
||||
cmd = kmalloc(sizeof(struct command), GFP_KERNEL);
|
||||
cmd = kzalloc(sizeof(struct command), GFP_KERNEL);
|
||||
if (cmd == NULL)
|
||||
return NULL;
|
||||
|
||||
memset(cmd, 0, sizeof(*cmd));
|
||||
|
||||
cmd->buffer = kmalloc(buffer_size, GFP_KERNEL);
|
||||
cmd->buffer = kzalloc(buffer_size, GFP_KERNEL);
|
||||
if (cmd->buffer == NULL) {
|
||||
kfree(cmd);
|
||||
return NULL;
|
||||
}
|
||||
memset(cmd->buffer, 0, buffer_size);
|
||||
cmd->buffer_size = buffer_size;
|
||||
|
||||
kobject_init(&cmd->kobj);
|
||||
|
|
|
|||
|
|
@ -563,11 +563,10 @@ static ssize_t remote_settings_file_write(struct file *file, const char __user *
|
|||
if (*offset != 0)
|
||||
return 0;
|
||||
|
||||
buff = kmalloc (count + 1, GFP_KERNEL);
|
||||
buff = kzalloc (count + 1, GFP_KERNEL);
|
||||
if (!buff)
|
||||
return -ENOMEM;
|
||||
|
||||
memset(buff, 0x0, count + 1);
|
||||
|
||||
if (copy_from_user(buff, ubuff, count)) {
|
||||
kfree(buff);
|
||||
|
|
|
|||
|
|
@ -77,13 +77,12 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
|
|||
/* vnc client won't work without bus-mastering */
|
||||
pci_set_master(pdev);
|
||||
|
||||
sp = kmalloc(sizeof(struct service_processor), GFP_KERNEL);
|
||||
sp = kzalloc(sizeof(struct service_processor), GFP_KERNEL);
|
||||
if (sp == NULL) {
|
||||
dev_err(&pdev->dev, "Failed to allocate memory\n");
|
||||
result = -ENOMEM;
|
||||
goto error_kmalloc;
|
||||
}
|
||||
memset(sp, 0, sizeof(struct service_processor));
|
||||
|
||||
spin_lock_init(&sp->lock);
|
||||
INIT_LIST_HEAD(&sp->command_queue);
|
||||
|
|
|
|||
Loading…
Reference in a new issue