GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-30 02:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] shpchp - replace kmalloc() with kzalloc() and cleanup arg of sizeof()

Browse source 
This patch replaces kmalloc() and memset() pair with kzalloc() and
cleans up the arg of sizeof() in SHPCHP driver.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kenji Kaneshige 2006-01-26 10:02:41 +09:00 • committed by Greg Kroah-Hartman
parent 287588b353
commit 57c95c0d1c
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/pci/hotplug/shpchp_core.c
View file

@ -117,22 +117,18 @@ static int init_slots(struct controller *ctrl)
u32 sun; u32 sun;
for (i = 0; i < ctrl->num_slots; i++) { for (i = 0; i < ctrl->num_slots; i++) {
slot = kmalloc(sizeof(struct slot), GFP_KERNEL); slot = kzalloc(sizeof(*slot), GFP_KERNEL);
if (!slot) if (!slot)
goto error; goto error;
memset(slot, 0, sizeof(struct slot));
hotplug_slot = kmalloc(sizeof(struct hotplug_slot), hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);
GFP_KERNEL);
if (!hotplug_slot) if (!hotplug_slot)
goto error_slot; goto error_slot;
memset(hotplug_slot, 0, sizeof(struct hotplug_slot));
slot->hotplug_slot = hotplug_slot; slot->hotplug_slot = hotplug_slot;
info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
goto error_hpslot; goto error_hpslot;
memset(info, 0, sizeof (struct hotplug_slot_info));
hotplug_slot->info = info; hotplug_slot->info = info;
name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL); name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
@ -383,12 +379,11 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!is_shpc_capable(pdev)) if (!is_shpc_capable(pdev))
return -ENODEV; return -ENODEV;
ctrl = kmalloc(sizeof(struct controller), GFP_KERNEL); ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
if (!ctrl) { if (!ctrl) {
err("%s : out of memory\n", __FUNCTION__); err("%s : out of memory\n", __FUNCTION__);
goto err_out_none; goto err_out_none;
} }
memset(ctrl, 0, sizeof(struct controller));
INIT_LIST_HEAD(&ctrl->slot_list); INIT_LIST_HEAD(&ctrl->slot_list);
rc = shpc_init(ctrl, pdev); rc = shpc_init(ctrl, pdev);
@ -400,7 +395,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_drvdata(pdev, ctrl); pci_set_drvdata(pdev, ctrl);
ctrl->pci_bus = kmalloc(sizeof (*ctrl->pci_bus), GFP_KERNEL); ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
if (!ctrl->pci_bus) { if (!ctrl->pci_bus) {
err("out of memory\n"); err("out of memory\n");
rc = -ENOMEM; rc = -ENOMEM;

4
drivers/pci/hotplug/shpchp_hpc.c
View file

@ -1390,15 +1390,13 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
ctrl->pci_dev = pdev; /* pci_dev of the P2P bridge */ ctrl->pci_dev = pdev; /* pci_dev of the P2P bridge */
spin_lock_init(&list_lock); spin_lock_init(&list_lock);
php_ctlr = (struct php_ctlr_state_s *) kmalloc(sizeof(struct php_ctlr_state_s), GFP_KERNEL); php_ctlr = kzalloc(sizeof(*php_ctlr), GFP_KERNEL);
if (!php_ctlr) { /* allocate controller state data */ if (!php_ctlr) { /* allocate controller state data */
err("%s: HPC controller memory allocation error!\n", __FUNCTION__); err("%s: HPC controller memory allocation error!\n", __FUNCTION__);
goto abort; goto abort;
} }
memset(php_ctlr, 0, sizeof(struct php_ctlr_state_s));
php_ctlr->pci_dev = pdev; /* save pci_dev in context */ php_ctlr->pci_dev = pdev; /* save pci_dev in context */
if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device == if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==