Skip to contentSkip to conversation

PCI PM: kzalloc() cleanup

RFC PATCH In review Adam Belay 2 participants 3 messages Nov 16, 2005 PCI

lore
Share & tools
lore

Adam Belay

author
#0 lore raw

RFC PATCH 5/6 PCI PM: kzalloc() cleanup

Use kzalloc() instead of kmalloc() and memset().

drivers/pci/pm.c +1 -3
@@ -300,12 +300,10 @@
 		return -EIO;
 	}
 
-	dev->pm = pm_data = kmalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
+	dev->pm = pm_data = kzalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
 	if (!pm_data)
 		return -ENOMEM;
 
-	memset(pm_data, 0, sizeof(struct pci_dev_pm));
-
 	pm_data->pm_offset = pm;
 
 	/* determine supported device states */
#1 lore raw
Quoted 6 lines · Adam Belay

Use kzalloc() instead of kmalloc() and memset().

drivers/pci/pm.c line 308

Quoted 10 lines
drivers/pci/pm.c +1 -3
@@ -300,12 +300,10 @@
 		return -EIO;
 	}
 
-	dev->pm = pm_data = kmalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
+	dev->pm = pm_data = kzalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
 	if (!pm_data)
 		return -ENOMEM;
 
-	memset(pm_data, 0, sizeof(struct pci_dev_pm));
-

You can merge this back with your other patch :)

thanks,

greg k-h

author
#2 lore raw
Quoted 15 lines · Greg KH
Quoted 14 lines · Adam Belay

Use kzalloc() instead of kmalloc() and memset().

drivers/pci/pm.c +1 -1
@@ -300,12 +300,10 @@
 		return -EIO;
 	}
 
-	dev->pm = pm_data = kmalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
+	dev->pm = pm_data = kzalloc(sizeof(struct pci_dev_pm), GFP_KERNEL);
 	if (!pm_data)
 		return -ENOMEM;
Quoted 8 lines

drivers/pci/pm.c line 308

Quoted 2 lines
drivers/pci/pm.c +0 -2
-	memset(pm_data, 0, sizeof(struct pci_dev_pm));
-

You can merge this back with your other patch :)

thanks,

greg k-h

Will do.

Thanks,
Adam