hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] drivers/eisa: 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>
This commit is contained in:
Deepak Saxena 2005-11-07 01:01:23 -08:00 committed by Linus Torvalds
parent e66860cbda
commit 8ac5436ced
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/eisa/eisa-bus.c
View File

@ -281,13 +281,11 @@ static int __init eisa_probe (struct eisa_root_device *root)
/* First try to get hold of slot 0. If there is no device /* First try to get hold of slot 0. If there is no device
* here, simply fail, unless root->force_probe is set. */ * here, simply fail, unless root->force_probe is set. */
if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) { if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
printk (KERN_ERR "EISA: Couldn't allocate mainboard slot\n"); printk (KERN_ERR "EISA: Couldn't allocate mainboard slot\n");
return -ENOMEM; return -ENOMEM;
} }
memset (edev, 0, sizeof (*edev));
if (eisa_request_resources (root, edev, 0)) { if (eisa_request_resources (root, edev, 0)) {
printk (KERN_WARNING \ printk (KERN_WARNING \
"EISA: Cannot allocate resource for mainboard\n"); "EISA: Cannot allocate resource for mainboard\n");
@ -317,14 +315,12 @@ static int __init eisa_probe (struct eisa_root_device *root)
force_probe: force_probe:
for (c = 0, i = 1; i <= root->slots; i++) { for (c = 0, i = 1; i <= root->slots; i++) {
if (!(edev = kmalloc (sizeof (*edev), GFP_KERNEL))) { if (!(edev = kzalloc (sizeof (*edev), GFP_KERNEL))) {
printk (KERN_ERR "EISA: Out of memory for slot %d\n", printk (KERN_ERR "EISA: Out of memory for slot %d\n",
i); i);
continue; continue;
} }
memset (edev, 0, sizeof (*edev));
if (eisa_request_resources (root, edev, i)) { if (eisa_request_resources (root, edev, i)) {
printk (KERN_WARNING \ printk (KERN_WARNING \
"Cannot allocate resource for EISA slot %d\n", "Cannot allocate resource for EISA slot %d\n",