Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] drivers/firmware: kmalloc + memset -> kzalloc conversion

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Deepak Saxena and committed by
Linus Torvalds
9c215384 49d0c603

+4 -9
+1 -2
drivers/firmware/edd.c
··· 715 715 716 716 if (!edev) 717 717 return 1; 718 - memset(edev, 0, sizeof (*edev)); 719 718 edd_dev_set_info(edev, i); 720 719 kobject_set_name(&edev->kobj, "int13_dev%02x", 721 720 0x80 + i); ··· 755 756 return rc; 756 757 757 758 for (i = 0; i < edd_num_devices() && !rc; i++) { 758 - edev = kmalloc(sizeof (*edev), GFP_KERNEL); 759 + edev = kzalloc(sizeof (*edev), GFP_KERNEL); 759 760 if (!edev) 760 761 return -ENOMEM; 761 762
+3 -7
drivers/firmware/efivars.c
··· 614 614 char *short_name; 615 615 struct efivar_entry *new_efivar; 616 616 617 - short_name = kmalloc(short_name_size + 1, GFP_KERNEL); 618 - new_efivar = kmalloc(sizeof(struct efivar_entry), GFP_KERNEL); 617 + short_name = kzalloc(short_name_size + 1, GFP_KERNEL); 618 + new_efivar = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL); 619 619 620 620 if (!short_name || !new_efivar) { 621 621 kfree(short_name); 622 622 kfree(new_efivar); 623 623 return 1; 624 624 } 625 - memset(short_name, 0, short_name_size+1); 626 - memset(new_efivar, 0, sizeof(struct efivar_entry)); 627 625 628 626 memcpy(new_efivar->var.VariableName, variable_name, 629 627 variable_name_size); ··· 672 674 if (!efi_enabled) 673 675 return -ENODEV; 674 676 675 - variable_name = kmalloc(variable_name_size, GFP_KERNEL); 677 + variable_name = kzalloc(variable_name_size, GFP_KERNEL); 676 678 if (!variable_name) { 677 679 printk(KERN_ERR "efivars: Memory allocation failed.\n"); 678 680 return -ENOMEM; 679 681 } 680 - 681 - memset(variable_name, 0, variable_name_size); 682 682 683 683 printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION, 684 684 EFIVARS_DATE);